Fix Bug on Token
Merge remote-tracking branch 'origin/master'
Fix Bug on Token