Allow custom token type
Merge pull request #14 from peterslivka/master

Allow custom token type