PEP-8-ify code
Merge pull request #1 from Tigge/master

PEP-8-ify code