tweak viewer docs
Merge remote-tracking branch: upstream/master