Nitpicking
Add environment options
Merge pull request #5 from zenangst/feature/environment-configuration

Feature/environment configuration