Fixes & symbol display in names
Merge pull request #29 from tamcap/develop

Fixes & symbol display in names