Merge pull request #3 from oliverzheng/master

Fixing text parsing
restore an extra test for Type Tool parsing