Merge pull request #59 from suntinghui/master

kh
Merge pull request #80 from liaojia/master

lJ