Merge pull request #1247 from jmaas/master

pep8 fixes