Updated to use more consistent token names
Merge branch 'master' of https://github.com/antkowiak/calc