Fix word boundaries.
Merge pull request #15 from bramstein/bs-fix-word-boundaries

Fix word boundaries.