PEP8 fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from tyml/master

Small PEP8 changes