Parsing JSON object works now
Merge branch 'query'