Merge pull request #879 from jmaas/master

more pep8 work