PEP8
Merge pull request #39 from xtao/pep8

PEP8 corrected.