Merge branch 'release/0.3'
Fixed token creation
Merge branch 'hotfix/invalid_token'
Merge branch 'hotfix/invalid_token' into dev
Merge branch 'master' into dev