Fixed bug
Added json parser