Fix for Issue #716 - Matcher should now work correctly for multi-line comments