Added ability to match only words with regex support