Allow Tokens to be passed as objects and not as string arguments
update change register
Merge branch '0.2.2'