Added json support
Unicode bug fix