Fixes #1. Now detects boundaries of keywords.