Fix issue with both user and guest token usage. Closes #6.
Merge branch 'fix-guest-token' into dev