Merge pull request #30 from suntinghui/master

jj
Merge pull request #39 from liaojia/master

ikl