Made minor updates and new version of the Token plugin