Merge branch 'various' into 'master'

Various improvements

Closes #41 and #42

See merge request !72
5 jobs for master in 15 minutes and 45 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Build
passed #140386
docker
build_linux_27

00:07:26

85.0%
passed #140387
docker
build_linux_36

00:07:58

85.0%
passed #140388
macosx
build_macosx_27

00:10:04

85.0%
passed #140389
macosx
build_macosx_36

00:09:07

85.0%
 
  Deploy
passed #140390
deployer
deploy_beta

00:00:17