Added json data
Fixed merge issue, thanks rob