Merge pull request #926 from jmaas/master

more pep8 work
Merge pull request #927 from jmaas/master

more pep8 work