Added '+' to wordchars.