Fixed env variable bugs
Merge pull request #24 from bobrown101/master

Fixed env variable bugs