Fix pep8
Merge pull request #407 from fantix/pep8

Fix pep8