Some updates to prepare the upload to pypi