Merge pull request #56 from suntinghui/master

lk
ll
Merge remote-tracking branch 'origin'
lj
Merge pull request #76 from liaojia/master

lj