Fixed the tags issues
Merge pull request #54 from n3phele/FixingTags

Fixed the tags issues