pep8 fix
Merge branch 'pep8fix' into develop