Merge pull request #698 from mandubian/json-macro-ext

Json macro correction + Json.prettyPrint