Merge branch 'bug#181' into 'master'

Proposed fix for Bug#181

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