PEP8
Merged branch 'pep8'