Issue #19 Initial JSON validation updated