Merge branch 'issue/22' into 'master'

Issue/22

See merge request !118
10 jobs for master in 34 minutes and 15 seconds (queued for 3 seconds)