Finishing the JSON parser
Merge