Add Claims support
Merge pull request #17 from Tpt/Claims

Adds Claims support