commit by bingcha
Merge pull request #2 from xixitest/chongzi

commit by bingcha