Add basic environment support
Merge pull request #306 from jbussdieker/master

Add basic environment support