fix double-space
PEP8
line length
nitpicking
Merge remote-tracking branch 'upstream/develop' into develop