Merge branch 'bug#97' into 'master'

Fix for Bug#97

See merge request !17
1 job from master in 0 seconds (queued for 14 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:04