Merge branch '29-allow-the-use-of-environment-variables-in-addition-to-command-line-options' into 'master' Resolve "allow the use of environment variables in addition to command line options" Closes #29 See merge request !25