Contributor changes

Including contributor changes which facilitate regex matcher extraction