Add support for returning an existing token

Fixes #6