Revert "Upgrade master
to develop
in setup.py
"
#650
Merged
master
to develop
in setup.py
"
#650