Merge pull request #154 from Tieske/master

added tokens for `done` callback