Add tokens. Fixes #185