fix for pep8
Merge branch 'develop'