Merge pull request #233 from izuzak/clarify_tags