Merge branch 'better-build' into 'master'

Minor rework

See merge request !5
3 jobs for 0.5.0 in 58 seconds (queued for 1 second)
latest