Added tagging feature
Merge pull request #2 from sesamechicken/tagging_feature

Added tagging feature