PEP8 fixes
Merge pull request from valeatory
Merge branch 'valeatory-master'