Merge pull request #129 from fuzzball81/pep8-cleanup