fixed swapping tokens with second click
Merge branch 'master' into gh-pages
publishing