fix setup.py typo
Merge branch 'fixsetup' into develop