Merge branch 'bug#91' into 'master'

Addressing bug#91

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