Merge branch 'master' into 'master'

Fixed issue #24

Closes #24

See merge request !19
1 job for master in 2 minutes and 6 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #4695
nightly

00:02:06