Fix setup.py. Update .gitignore
Fix setup.py.
Fix setup.py.
Fix setup.py.
Update readme.
Merge branch 'develop'