Changes to setup.py and __init__.py