Merge pull request #24 from suntinghui/master

oo
Merge pull request #32 from liaojia/master

jdif