fix issues with tokenization see #7.