Merge pull request #16 from liaojia/master

jia
Merge pull request #11 from suntinghui/master

jia