Added PyPI support