adding a json writer
Merge master branch