updates to correspond to JSONWP
Merge pull request #59 from jlipps/master

JSONWP compatibility fixes