Token works, confirmed with comments
Merge pull request #14 from hey-you-project/Token

Token works, confirmed with comments
Merge branch 'master' into Birthday
Merge fixes.