pep8
Merge pull request #38 from steinwurf/pep8

pep8