Preparing for pypi
Fixed up for pypi