Add a token additional description
Merge branch 'master' into twitter