Merge pull request #13 from xuexb/dev

发布1.2
Merge pull request #14 from xuexb/master

Merge pull request #13 from xuexb/dev