setup.py improvements
Merge pull request #85 from ndawe/setup

setup.py improvements