Finalization
Merge pull request #7 from florianheinemann/require-uid-AND-token

Finalization of require-uid-AND-token