Added tag-finder and tests.