Refactored the token extraction to allow overrides.
Fixed comment.
Merge pull request #41 from Georadix/feature/token-validation

Refactored the token extraction to allow overrides.