Updated to latest
Merge branch 'master' of https://github.com/shannah/cn1-mirah-json-macros