Merge pull request #917 from jmaas/master

more pep8 work