Fixed a bug with tokens
Merge pull request #143 from BNoiZe/master

Fixed a bug with tokens