Merge pull request #12 from suntinghui/master

kk
Merge pull request #18 from liaojia/master

仍