fix viewer
Merge branch 'master' of github.com:qcl/master-research