even more PEP8 improvements
Merge pull request #26 from fabiansinz/master

Even more PEP8 improvements