Add missing files
Merge branch 'master' into viewer