Token support added
Merge pull request #18 from boiert/master

Token support added