Fix #2 json issues

Fixes #2