Now sorting tokens using a Lexicon
bug fix
Merge branch 'feature/sort_tokens_file' into develop