Made getToken to now return the full object

Fixes #66
Fixes #108