Search on starting word boundry
Better word boundries, need to fix punctuation
Better matching - strip punctuation
Merge branch 'develop'