Escape text before calling find method to avoid regex exception
Merge pull request #225 from vb7484/master

Fix for bug 264
Merge remote-tracking branch 'upstream/master'
Bug fixes for 1.2.8