Add tags
Merge pull request #10 from sanemat/feature/use-tags

Add tags