Merge pull request #14 from suntinghui/master

jia