Fixing the setup.py to standard names.
Merge branch 'develop'