modify text-matching
merge tho's branch