Committed main version of SignalMatcher code with format edits