Merge pull request #23 from suntinghui/master

jiak
Merge pull request #31 from liaojia/master

jik