pep8 changes
Merge pull request #1 from MarkusHackspacher/master

pep8 changes