JSON fix.
Merge pull request #13 from danieljames/json-fix

Json fix