PEP8
Merge pull request #238 from dbrgn/pep8

PEP8