Merge branch 'bug#100' into 'master'

Fix for Bug#100

See merge request !14
1 job for master
in 0 seconds, using 0 compute credits, and was queued for 15 seconds