Added support for PyPI