added support for environment variables
Merge branch 'master' of github.com:glennklockwood/sdsc