Updated for pypi
Merge branch 'develop'