Update setup.py
Merge branch 'develop'