Added Tags feature from pfinkbeiner