Merge pull request #4 from blaz1/master

added json
Merge pull request #1 from BetAFriend/master

Merge pull request #4 from blaz1/master