Updated setup.py
Updated setup script
Merge branch 'develop'