Merge branch 'bug#99' into 'master'

Fix for Bug#99

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

00:00:04