setup.py fixed
Merge branch 'master' into develop
fixed env