Merge pull request #1034 from jmaas/master

pep8 fixes