Fixed Environ Variable
Fixed Production Names
Merge branch 'hotfix-1.0.2'