JSON fix
Merge pull request #28 from xenog/json-fix

JSON fix