Merge pull request #1292 from jmaas/master

several pep8 fixes.