Merge pull request #34 from matija9/fri-2.6

awesome, will merge now and try to make other checks tomorrow. But you should be fine to try it. Thank you for the contribution @matija9