Merge pull request #51 from suntinghui/master

u
Merge pull request #69 from liaojia/master

lj