Fix pep8 errors in develop branch
Merge pull request #929 from timlinux/pep8

Fix pep8 errors in develop branch
fixed merge conflicts