Fixing Tokenizers, and error
Merge pull request #102 from aequasi/master

Fixing tokenizer