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