Merge branch 'issue81' into 'master'

Issue81

Closes #81

See merge request !102
2 jobs for 1.10.20 in 2 minutes and 7 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Build
passed #83359
build

00:00:52

 
  Deploy
passed #83360
manual
deploy_production

00:01:14