Add Toks
Merge pull request #3381 from thomasthorsen/master

Add Toks