Added the ability to use tokens as a filtering mechanism#29

Aangbaeck wants to merge 2 commits intoupta:masterupta/pubsub:masterfrom

Aangbaeck:masterAangbaeck/pubsub:masterCopy head branch name to clipboard