add enviromental settings
Merge branch 'develop'