Use environment variables for default configuration
Simpler approach to setting implementation properly.
Merge branch 'use_environment_variable'