Add support for tags
Merge pull request #6 from abayer/add-tags

Add support for tags