Codeviewer master feature #198