Fixed parser for empty JSON
Merge branch 'jsonfix' into develop