Improved rendering of event names
Merge pull request #1 from schreiaj/master

Improved rendering of event names