Changed tokenisation from space to non-word characters(i.e \W)