Fix JSON encoding
json fixes
Merge branch 'master' of github.com:jeffsu/red-velvet