Decoupled access token handling
Merge pull request #129 from SammyK/decouple-access-token-handling

Decoupled access token handling