Merge branch 'master' into develop
update setup.py
Merge branch 'develop'