Made pep8 compatible
Merge pull request #59 from djinn/feature/pep8

Made pep8 compatible