Merge pull request #1 from Wingle/dev

Dev
Merge pull request #2 from Wingle/dev

改改。
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
bug fix.
1.2