Add tagging functionality.
Merge pull request #7 from leftclickben/AddTagging

Add tagging functionality.