Put word boundaries during token replacing

Conflicts:
	main.js
Merge pull request #4 from apechimp/master

Put word boundaries during token replacing