merge in new setup.py