Add Environment Detection
Merge branch 'dev'