Adding the matchers mentioned in #61