fix pep8/pyflakes
Merge branch 'master' into nine