pep8
Merge branch 'bug/random_pep8_fix' into develop