Added changes for uploading to PyPI