Made the update requested by kg.  The code now appends Path.DirectorySeparatorChar instead of "\\" while trying to resolve potentially non-ambiguous matches...
Merge branch 'Fix-Non-Ambiguous-Matches'