current version
Merge branch 'master' of https://github.com/kzn/tokens.git
refactoring