Merge pull request #7 from leksah/master

Migrate from String to Text