Fix flake8 errors
Merge remote-tracking branch 'origin/7.0' into 7.0-pep8
Merge pull request #6 from guewen/7.0-pep8

Fix flake8 errors