Merge pull request #212 from erikd/master

Reduce number of Text to String and String to Text conversions.
Version bumps