Fixed tokenizer, hopefully I won't have to fix it again
Merge branch 'master' of github.com:rhaps0dy/meCh