added  and  to environment variables
Merge pull request #7 from wick-ed/master

reviewed diff and tested locally with 0.6.0