Merge pull request #7 from suntinghui/master

JIa
Merge pull request #12 from liaojia/master

不是＃7， 是＃12