Merge pull request #12 from shanzi/gitmodel

Gitmodel Testing
PEP8.
Merge pull request #13 from xtao/pep8

PEP8.
merge master