New stuff
Merge branch 'master' of gh:kerinin/environment