added prettyprint
changed to reflect prettyprint
Merge branch 'add_json'