stash of changes for JSON fix
closes #1
Merge pull request #7 from radekstepan/improve-json

Improve json