Merge pull request #38 from kuu/master

Text-related bug-fixes.