Merge pull request #965 from jmaas/master

pep8 fixes