Matcher changed to work from the command line.