Update better re matching issues 515/529
Contributed new site