Changed word boundaries

Further improves issue #10