Merge branch 'dev' into 'test'

fix for #138

See merge request !60
2 jobs for test in 3 minutes and 30 seconds (queued for 2 seconds)