Merge pull request #978 from jmaas/master

pep8 fixes