Added a custom matcher.  Sweet