Fixed reference to old package name
Fix Python 3 compatibility
PEP8