Modified packaged to work with pypi.