Merge pull request #135 from mreist/master

getting master
Merge pull request #136 from mreist/master

getting master
Changed number of tokens to 1
Merge pull request #137 from mreist/Jay

Jay