Merge branch 'dev' into 'master'

Fix for #1

See merge request !2
2 jobs for master in 14 seconds (queued for 7 seconds)