Merge branch 'Issues#91' into 'master'

Issues#91

See merge request !56
3 jobs for master in 5 minutes and 29 seconds (queued for 1 second)