Improved setup.py