Merge pull request #262 from BrainSlugs83/Fix-Non-Ambiguous-Matches

Fixes an "AmbiguousMatchException" where the extra matches really aren't all that Ambiguous...
Merge remote-tracking branch 'upstream/master'