Merge branch 'bug#102' into 'master'

Bug#102

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

00:00:04