Develop

Merged in some fixes to setup.py