Tweaked imports
Packaged properly for distribution via PyPI
As submitted to PyPI.