Merge branch 'jh/json-writer'