Merge branch 'bug#99' into 'master'

Fix for Bug#99

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