Merge pull request #78 from liaojia/master

lj
Merge pull request #79 from liaojia/master

修改
Merge pull request #59 from suntinghui/master

kh