Changed the environment variable for users to set.
Merge branch 'master', remote-tracking branch 'origin'