more json magic
Merge branch 'jsonic'