Merge branch 'issue-24' into 'master'

Try a fix for issue 24

Closes #24

See merge request !27
5 jobs for master in 2 minutes and 34 seconds (queued for 3 seconds)