Merge pull request #13 from xuexb/dev

发布1.2