Note System/getProperty must be used to access environment variables.
Merge branch 'master' into pr/29