pep8: pep8'ing
Merge remote-tracking branch 'origin/pep8'