Merge branch 'develop' of https://github.com/axlm/environment into develop