path fixes
Merge branch 'master' of https://github.com/Oskasb/environment