Merge pull request #145 from mpeuster/master

Cleanup: Environment cleanup mechanisms. Closes #139