Using pep8 to check code
Correct pep8
Correct pep8
Correct pep8
Merge branch 'hotfix/pep8'