Changed from environment variables to a config file.
Merge branch 'configfile'