Environment definition refactoring
Merge pull request #16 from fdammeke/master

Environment definition refactoring