Updated to the API json-1.0 branch.
Merge pull request #3 from jamezp/json-1.0

Updated to the API json-1.0 branch.