Merge branch 'develop'
Updated setup.py parameters
Fixed issues to submit package to PyPi
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop