added json parser
pre merge
merge nick