Revised setup.py