setup.py fix
Merge branch 'develop'