pep8 fixes
Merge pull request #1 from matlobocki/master

pep8 fixes