better handling of environment variables
Merge pull request #2 from rfriese/master

better handling of environment variables