Updated Token_Generator function
Merge branch 'master' into Yash_Side