json: Fixes for C++ compilers.
Merge pull request #12 from tallica/master

Fixes for C++ compilers