diff --git a/lib/ace/ext/static.css b/lib/ace/ext/static.css
index d048034f..7d785b49 100644
--- a/lib/ace/ext/static.css
+++ b/lib/ace/ext/static.css
@@ -12,7 +12,7 @@
     margin-right: 3px;
 }
 
-.ace-row { clear: both; }
+.ace_line { clear: both; }
 
 *.ace_gutter-cell {
   -moz-user-select: -moz-none;
diff --git a/lib/ace/ext/static_highlight.js b/lib/ace/ext/static_highlight.js
index efb9c4db..e62ae3b2 100644
--- a/lib/ace/ext/static_highlight.js
+++ b/lib/ace/ext/static_highlight.js
@@ -52,7 +52,9 @@ var baseStyles = require("../requirejs/text!./static.css");
 * @returns {object} An object containing: html, css
 */
 
-exports.render = function(input, mode, theme) {
+exports.render = function(input, mode, theme, lineStart) {
+    lineStart = parseInt(lineStart || 1, 10);
+    
     var session = new EditSession("");
     session.setMode(mode);
     session.setUseWorker(false);
@@ -72,8 +74,8 @@ exports.render = function(input, mode, theme) {
     
     for(var ix = 0; ix < length; ix++) {
         var lineTokens = tokens[ix].tokens;
-        stringBuilder.push("<div class='ace-row'>");
-        stringBuilder.push("<span class='ace_gutter ace_gutter-cell' unselectable='on'>" + (ix+1) + "</span>");
+        stringBuilder.push("<div class='ace_line'>");
+        stringBuilder.push("<span class='ace_gutter ace_gutter-cell' unselectable='on'>" + (ix + lineStart) + "</span>");
         textLayer.$renderLine(stringBuilder, 0, lineTokens, true);
         stringBuilder.push("</div>");
     }