Updated evironment detection.
Merge pull request #8 from MyLocalBeer/jstaudt

Updated evironment detection.