Merge branch 'develop'
Merge pull request #1 from XadillaX/develop

Merge branch 'master' into develop
Merge branch 'master' of github.com:XadillaX/Toshihiko
a bug about json type fixed
Merge branch 'master' into develop
package