Adding a radius to the corners of the white background.  fixes #9579
Adding test and code to capture matches from multiple files, as well as singles.  fixes #9565