Modified setup.py according to Robert's instructions
Merge pull request #224 from leeping/master

Modified setup.py according to Robert's instructions