added tagging feature
resolved merge conflicts