PEP8 fixes
Fixed drag
Merge remote-tracking branch 'origin/master'