diff --git a/include/bx/string.h b/include/bx/string.h
index 25665bf..5fffe67 100644
--- a/include/bx/string.h
+++ b/include/bx/string.h
@@ -261,7 +261,7 @@ namespace bx
 	StringView findIdentifierMatch(const StringView& _str, const StringView& _word);
 
 	/// Finds any identifier from NULL terminated array of identifiers.
-	StringView findIdentifierMatch(const StringView& _str, const char** _words);
+	StringView findIdentifierMatch(const StringView& _str, const char** _words, int32_t _num = INT32_MAX);
 
 	/// Cross platform implementation of vsnprintf that returns number of
 	/// characters which would have been written to the final string if
diff --git a/src/string.cpp b/src/string.cpp
index f85c82f..cdc2a91 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -687,9 +687,10 @@ namespace bx
 		return StringView(_str.getTerm(), _str.getTerm() );
 	}
 
-	StringView findIdentifierMatch(const StringView& _str, const char** _words)
+	StringView findIdentifierMatch(const StringView& _str, const char** _words, int32_t _num)
 	{
-		for (StringView word = *_words; !word.isEmpty(); ++_words, word = *_words)
+		int32_t ii = 0;
+		for (StringView word = *_words; ii < _num && !word.isEmpty(); ++ii, ++_words, word = *_words)
 		{
 			StringView match = findIdentifierMatch(_str, word);
 			if (!match.isEmpty() )