Updated for pypi publication