feat: Add --raw-json flag and fix --json output
#669
Merged
--raw-json flag and fix --json output
#669