diff --git a/src/Editor.js b/src/Editor.js
index 70b4ee10..558dd48f 100644
--- a/src/Editor.js
+++ b/src/Editor.js
@@ -496,11 +496,11 @@ ace.Editor.prototype.moveCursorToPosition = function(pos) {
 
 ace.Editor.prototype.gotoLine = function(lineNumber) {
     this._blockScrolling = true;
-    this.moveCursorTo(lineNumber, 0);
+    this.moveCursorTo(lineNumber-1, 0);
     this._blockScrolling = false;
 
     if (!this.isRowVisible(this.getCursorPosition().row)) {
-        this.scrollToRow(lineNumber - Math.floor(this.getVisibleRowCount() / 2));
+        this.scrollToRow(lineNumber - 1 - Math.floor(this.getVisibleRowCount() / 2));
     }
 },
 
diff --git a/src/GutterLayer.js b/src/GutterLayer.js
index 4256a4e9..b2499f6d 100644
--- a/src/GutterLayer.js
+++ b/src/GutterLayer.js
@@ -10,7 +10,7 @@ ace.GutterLayer.prototype.update = function(config) {
     var html = [];
     for ( var i = config.firstRow; i <= config.lastRow; i++) {
         html.push("<div class='gutter-cell' style='height:" + config.lineHeight
-                + "px;'>", i, "</div>");
+                + "px;'>", (i+1), "</div>");
         html.push("</div>");
     }