importing some fixes for a dev release to pypi