Merge pull request #42 from cmanou/master

to json