Updated setup.py version
Merge branch 'develop'