pep8 fix
Merge branch 'development'