add support for punctuation