pep8 fixes
Merge pull request #47 from hermanschaaf/master

Fix pep8 errors