Merge pull request #104 from olear/master

Wrap strings with tr()