Merge branch 'gh-pages' of https://github.com/iwisunny/wxi.js
Merge branch 'master' of https://github.com/iwisunny/wxi.js