On unix systems, environment variables are case sensitive (fixes #159)
Merge branch 'master' into develop