format
Merge pull request #1 from louxiu/master

pep8 format