fixing issues #2 and #6
Merge branch 'master' of https://github.com/owlike/genson