Merge pull request #31 from liaojia/master

jik
Merge pull request #24 from suntinghui/master

oo