Merge pull request #54 from suntinghui/master

lj
lj# Please enter the commit message for your changes. Lines starting
LJ
f
Merge remote-tracking branch 'origin'
lj
Merge pull request #74 from liaojia/master

LJ