Added tagging
Merge fix