Merge pull request #14 from suntinghui/master

gg
Merge pull request #21 from liaojia/master

Merge pull request #14 from suntinghui/master