Fix pep8 errors
Merge pull request #252 from ameade/fix-pep8

Fix pep8 errors