Merge branch 'PR2' into 'master'

Proposed fix for bug 87

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