Updated Tokenizer
Merge branch 'master' of https://github.com/rubengrootroessink/IntelligentDesign.git