added tagging
Merge branch 'tagging'