Some small enviromental refactoring
Merge branch 'master' of https://github.com/artie-groove/tms
Some small environmental changes (step2)