Added word boundaries (closes #3)