Upgraded setup.py