Merge pull request #65 from suntinghui/master

lj
lj
Merge remote-tracking branch 'origin'
lj
lj
Merge pull request #87 from liaojia/master

lj