added json parser
changed wrapper