Merge branch 'multiple-issues' into 'master'

Fixes to multiple issues

Closes #6, #8, and #9

See merge request !10
5 jobs for master in 23 minutes and 5 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #126469
docker
build_linux_27

00:17:19

95.0%
passed #126470
docker
build_linux_36

00:17:33

95.0%
passed #126471
macosx
build_macosx_27

00:22:30

95.0%
passed #126472
macosx
build_macosx_36

00:22:29

95.0%
 
  Deploy
passed #126473
deployer
deploy_beta

00:00:27