Tokenize now keeps non-alphanumeric characters instead of ignoring them