Support for CNET style tags
Merge pull request #26 from litso/improve_tags

Support for CNET style tags