Override Text and Comment

Fixes #87
Fixes #88
Merge pull request #96 from arv/text-and-comment

Override Text and Comment