Merge pull request #62 from suntinghui/master

lj
Merge pull request #83 from liaojia/master

lj