Merge branch 'bug#91' into 'master'

Addressing bug#91

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

00:00:04