using json on Viewer - fix
Merge remote-tracking branch 'origin/master'
editing of comments