Modified setup.py according to Robert's instructions