Fix #258: Dashes to spaces.
Merge pull request #266 from arxanas/token-dashes

Fix #258: Dashes to spaces.