Improvenments Tokens

+ Tokens
+ Comments
Merge pull request #122 from Peda1996/master

Improvenments Tokens