Added the option to match substrings

This will also solve issues for non-English words matching