Fixing #29 - Adding json parse