PEP8 & py3k compliance.
Merge pull request #3 from hansenerd/master

PEP8 & py3k compliance.