modified setup.py and related files