Feature/37 a better way for matchers to accept types