More work on Token Maker
Merge branch 'master' of https://github.com/sonic45132/LexAnal