Merge pull request #14 from bzar/master

Add extern for including to C++
[json] Fix peeking so that it stops at \0
[json] Fix C++ style comments