Merge pull request #129 from marcesher/master

Ensure logging is picking up correct environment