Revert "Merge branch 'morefix' into 'master'"

This reverts merge request !9
2 jobs for master in 1 second (queued for 3 seconds)