Merge pull request #4 from blaz1/master

added json