added Comments
Merge branch 'master' into fixtokens
removed TokenList
added Typecheck and alias parameter to Token