Introduce tags
Merge branch 'devel' into tags
Merge pull request #8 from metastudio/tags

Add tags support