Fixes #318.
Merge pull request #319 from AshFurrow/tokens

@orta => Fixes #318.