#221 getenv variables
Merge branch 'master' into 16-Rebranding-Design