Modify Environment Detection Code
Merge branch 'dev'