Added additional display mode.
Merge remote-tracking branch 'origin/master' into PointNormals