Merge branch 'issue#22' into 'master'

Fixes for #20 and improvements like suggested in #22

Closes #20

See merge request !11
3 jobs for master in 3 minutes and 55 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed test_hasa_install #77356

00:03:49

 
  Deploy
passed pages #77357

00:00:05

passed pages:deploy

00:00:00