Updated version on setup.py
Merge branch 'develop'