Env variables
Merge pull request #42 from dckesler/master

Env variables