Update setup.py

merged from develop