updated with tags
Merge pull request #1 from chappers/tags

updated with tags