diff --git a/lib/highlighter.js b/lib/highlighter.js
index <HASH>..<HASH> 100644
--- a/lib/highlighter.js
+++ b/lib/highlighter.js
@@ -39,7 +39,7 @@ var Highlighter = createReactClass({
     caseSensitive: PropTypes.bool,
     ignoreDiacritics: PropTypes.bool,
     diacriticsBlacklist: PropTypes.string,
-    matchElement: PropTypes.string,
+    matchElement: PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.func]),
     matchClass: PropTypes.string,
     matchStyle: PropTypes.object
   },
Allow passing React components as matchElement

This fixes a warning related to prop-types in development