1.2 发布
Merge pull request #39 from jayli/master

1.2 发布