Updated for PyPI publishing