TUSS11

Fixes bug caused by name display.
Solve conflicts with TUSS11's pull request and merge