diff --git a/js/rainbow.js b/js/rainbow.js
index c6d5f517..4671d432 100644
--- a/js/rainbow.js
+++ b/js/rainbow.js
@@ -84,9 +84,9 @@ window['Rainbow'] = (function() {
         global_class,
 
         /**
-         * @type {null|Function}
+         * @type {Array}
          */
-        onHighlight;
+        onHighlight = [];
 
     /**
      * cross browser get attribute for an element
@@ -631,8 +631,9 @@ window['Rainbow'] = (function() {
                     replacement_positions = {};
 
                     // if you have a listener attached tell it that this block is now highlighted
-                    if (onHighlight) {
-                        onHighlight(block, language);
+                    if (onHighlight.length > 0) {
+                        for(ohn=0; ohn<onHighlight.length; ohn++)
+                        onHighlight[ohn](block, language);
                     }
 
                     // process the next block
@@ -739,7 +740,7 @@ window['Rainbow'] = (function() {
          * @param {Function} callback
          */
         onHighlight: function(callback) {
-            onHighlight = callback;
+            onHighlight.push(callback);
         },
 
         /**
diff --git a/tests/api.html b/tests/api.html
index 74e0e037..2349b392 100644
--- a/tests/api.html
+++ b/tests/api.html
@@ -49,5 +49,31 @@ <h1>API Test Page</h1>
                 $("#stuff").append('<p>got callback<p>');
             });
         }, 1000);
+
+        // Set an onHighlight() callback
+        setTimeout(function() {
+            Rainbow.onHighlight(function(){
+                $("#stuff").append('<p>Got onHighlight() callback</p>')
+            });
+
+            $("#stuff").append('<p>code inserted dynamically with callback:</p><pre><code data-language="javascript">var html = $("#stuff").html();</code></pre>');
+            Rainbow.color();
+        }, 1250);
+
+        // Set multiple onHighlight() callbacks
+        setTimeout(function() {
+            Rainbow.onHighlight(function(){
+                window._OHTest = 1;
+            });
+
+            Rainbow.onHighlight(function(){
+                window._OHTest++;
+                $("#stuff").append('<p>This number should be 2: <b>'
+                    + window._OHTest + '</b></p>');
+            });
+
+            $("#stuff").append('<p>code inserted dynamically with callback:</p><pre><code data-language="javascript">var html = $("#stuff").html();</code></pre>');
+            Rainbow.color();
+        }, 1500);
     </script>
 </body>