Merge branch 'master', remote-tracking branch 'origin' into clean-pep8
Fix pep8 issues and merge master