fix issues with tokenization see #7.
Merge pull request #8 from bcoe/tokenization-fix

fix issues with tokenization see #7.