Add json
Merge pull request #16 from christian92m5/master

Add json