Merge pull request #12 from srounce/master

User environment variables are overwritten