diff --git a/dist/highlightjs-line-numbers.min.js b/dist/highlightjs-line-numbers.min.js
index 188f0b1..d332702 100644
--- a/dist/highlightjs-line-numbers.min.js
+++ b/dist/highlightjs-line-numbers.min.js
@@ -1 +1 @@
-!function(t,e){"use strict";function n(){var t=e.createElement("style");t.type="text/css",t.innerHTML=f(".{0}{border-collapse:collapse}.{0} td{padding:0}.{1}:before{content:attr({2})}",[o,h,u]),e.getElementsByTagName("head")[0].appendChild(t)}function r(n){"complete"===e.readyState?l(n):t.addEventListener("DOMContentLoaded",function(){l(n)})}function l(n){try{var r=e.querySelectorAll("code.hljs");for(var l in r)r.hasOwnProperty(l)&&s(r[l],n)}catch(i){t.console.error("LineNumbers error: ",i)}}function s(t,e){if("object"==typeof t){e=e||{singleLine:!1};var n=e.singleLine?0:1,r=i(t.innerHTML);if(r.length>n){for(var l="",s=0,g=r.length;s<g;s++)l+=f('<tr><td class="{0}"><div class="{1} {2}" {3}="{5}"></div></td><td class="{4}"><div class="{1}">{6}</div></td></tr>',[d,c,h,u,a,s+1,r[s].length>0?r[s]:" "]);t.innerHTML=f('<table class="{0}">{1}</table>',[o,l])}}}function i(t){return 0===t.length?[]:t.split(/\r\n|\r|\n/g)}var o="hljs-ln",c="hljs-ln-line",a="hljs-ln-code",d="hljs-ln-numbers",h="hljs-ln-n",u="data-line-number",f=function(t,e){return t.replace(/\{(\d+)\}/g,function(t,n){return e[n]?e[n]:t})};t.hljs?(t.hljs.initLineNumbersOnLoad=r,t.hljs.lineNumbersBlock=s,n()):t.console.error("highlight.js not detected!")}(window,document);
\ No newline at end of file
+!function(t,e){"use strict";function n(){var t=e.createElement("style");t.type="text/css",t.innerHTML=v(".{0}{border-collapse:collapse}.{0} td{padding:0}.{1}:before{content:attr({2})}",[a,f,g]),e.getElementsByTagName("head")[0].appendChild(t)}function r(n){"complete"===e.readyState?l(n):t.addEventListener("DOMContentLoaded",function(){l(n)})}function l(n){try{var r=e.querySelectorAll("code.hljs");for(var l in r)r.hasOwnProperty(l)&&o(r[l],n)}catch(s){t.console.error("LineNumbers error: ",s)}}function o(t,e){if("object"==typeof t){e=e||{singleLine:!1};var n=e.singleLine?0:1,r=i(t),l=c(r);if(l.length>n){for(var o="",s=0,m=l.length;s<m;s++)o+=v('<tr><td class="{0}"><div class="{1} {2}" {3}="{5}"></div></td><td class="{4}"><div class="{1}">{6}</div></td></tr>',[u,d,f,g,h,s+1,l[s].length>0?l[s]:" "]);t.innerHTML=v('<table class="{0}">{1}</table>',[a,o])}}}function s(t){for(var e="",n=t.innerText.split(/\r\n|\r|\n/g),r=0;r<n.length;r++)t.innerText=n[r],e+=t.outerHTML,r<n.length-1&&(e+="\n");return e}function i(t){var e="",n=t.childNodes;for(var r in n)n.hasOwnProperty(r)&&(e+="hljs-comment"===n[r].className?s(n[r]):n[r].childNodes.length?n[r].outerHTML:n[r].textContent);return e}function c(t){return 0===t.length?[]:t.split(/\r\n|\r|\n/g)}var a="hljs-ln",d="hljs-ln-line",h="hljs-ln-code",u="hljs-ln-numbers",f="hljs-ln-n",g="data-line-number",v=function(t,e){return t.replace(/\{(\d+)\}/g,function(t,n){return e[n]?e[n]:t})};t.hljs?(t.hljs.initLineNumbersOnLoad=r,t.hljs.lineNumbersBlock=o,n()):t.console.error("highlight.js not detected!")}(window,document);
\ No newline at end of file
diff --git a/src/highlightjs-line-numbers.js b/src/highlightjs-line-numbers.js
index 8fcd3e2..ad89a07 100644
--- a/src/highlightjs-line-numbers.js
+++ b/src/highlightjs-line-numbers.js
@@ -2,10 +2,10 @@
 	'use strict';
 
 	var TABLE_NAME = 'hljs-ln',
-	    LINE_NAME = 'hljs-ln-line',
-	    CODE_BLOCK_NAME = 'hljs-ln-code',
-	    NUMBERS_BLOCK_NAME = 'hljs-ln-numbers',
-	    NUMBER_LINE_NAME = 'hljs-ln-n',
+		LINE_NAME = 'hljs-ln-line',
+		CODE_BLOCK_NAME = 'hljs-ln-code',
+		NUMBERS_BLOCK_NAME = 'hljs-ln-numbers',
+		NUMBER_LINE_NAME = 'hljs-ln-n',
 		DATA_ATTR_NAME = 'data-line-number';
 
 	// string format
@@ -75,7 +75,8 @@
 		// convert options
 		var firstLineIndex = !!options.singleLine ? 0 : 1;
 
-		var lines = getLines(element.innerHTML);
+		var text = changeMultilineComments(element);
+		var lines = getLines(text);
 
 		if (lines.length > firstLineIndex) {
 			var html = '';
@@ -105,6 +106,37 @@
 		}
 	}
 
+	function duplicateMultilineTag(element){
+		var result = '';
+		var lines = element.innerText.split(/\r\n|\r|\n/g);
+		for(var i = 0; i<lines.length; i++){
+			element.innerText = lines[i];
+			result += element.outerHTML;
+			if(i < lines.length -1)
+				result += '\n';
+		}
+		return result;
+	}
+
+	function changeMultilineComments(element) {
+		var result = '';
+		var children = element.childNodes;
+		for(var child in children){
+			if(children.hasOwnProperty(child)) {
+				if(children[child].className === "hljs-comment"){
+					result += duplicateMultilineTag(children[child]);
+				}
+				else if(children[child].childNodes.length) {
+					result += children[child].outerHTML;
+				}
+				else {
+					result += children[child].textContent;
+				}
+			}
+		}
+		return result;
+	}
+
 	function getLines(text) {
 		if (text.length === 0) return [];
 		return text.split(/\r\n|\r|\n/g);