Merge pull request #38 from suntinghui/master

pi
cc
Merge remote-tracking branch 'origin'
cc
Merge pull request #51 from liaojia/master

pu