Add tags
Merge pull request #1 from jmoralesc/feature/add-tags

Add tags