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

JSON fix