pedantic warnings fixed
Merge branch 'master' of https://github.com/PaulDodd/JsonParser

merge to boggs