diff --git a/api/edit_session.html b/api/edit_session.html
index 8841d85a..ca33eb83 100644
--- a/api/edit_session.html
+++ b/api/edit_session.html
@@ -122,10 +122,12 @@
                             </li>
                           </ul>
                         </li>
-                        <li data-dropdown="dropdown" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle"><span>Functions (72)</span><b class="caret"></b></a>
+                        <li data-dropdown="dropdown" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle"><span>Functions (74)</span><b class="caret"></b></a>
                           <ul class="dropdown-menu">
                             <li data-id="EditSession.addDynamicMarker" class="memberLink"><a href="#EditSession.addDynamicMarker" class="" title="EditSession.addDynamicMarker (class method)" data-id="EditSession.addDynamicMarker">addDynamicMarker</a>
                             </li>
+                            <li data-id="EditSession.addGutterDecoration" class="memberLink"><a href="#EditSession.addGutterDecoration" class="" title="EditSession.addGutterDecoration (class method)" data-id="EditSession.addGutterDecoration">addGutterDecoration</a>
+                            </li>
                             <li data-id="EditSession.addMarker" class="memberLink"><a href="#EditSession.addMarker" class="" title="EditSession.addMarker (class method)" data-id="EditSession.addMarker">addMarker</a>
                             </li>
                             <li data-id="EditSession.clearAnnotations" class="memberLink"><a href="#EditSession.clearAnnotations" class="" title="EditSession.clearAnnotations (class method)" data-id="EditSession.clearAnnotations">clearAnnotations</a>
@@ -222,6 +224,8 @@
                             </li>
                             <li data-id="EditSession.remove" class="memberLink"><a href="#EditSession.remove" class="" title="EditSession.remove (class method)" data-id="EditSession.remove">remove</a>
                             </li>
+                            <li data-id="EditSession.removeGutterDecoration" class="memberLink"><a href="#EditSession.removeGutterDecoration" class="" title="EditSession.removeGutterDecoration (class method)" data-id="EditSession.removeGutterDecoration">removeGutterDecoration</a>
+                            </li>
                             <li data-id="EditSession.removeMarker" class="memberLink"><a href="#EditSession.removeMarker" class="" title="EditSession.removeMarker (class method)" data-id="EditSession.removeMarker">removeMarker</a>
                             </li>
                             <li data-id="EditSession.replace" class="memberLink"><a href="#EditSession.replace" class="" title="EditSession.replace (class method)" data-id="EditSession.replace">replace</a>
@@ -494,6 +498,40 @@
                       </div>
                     </div>
                   </article>
+                  <article id="EditSession.addGutterDecoration" data-title="EditSession.addGutterDecoration (class method)" class="article">
+                    <div class="section method">
+                      <div class="memberContent">
+                        <div class="title">
+                          <ul class="signatures">
+                            <li class="signature">
+                              <ul>
+                                <li class="signature-call"><span id="EditSession.addGutterDecoration" class="member-name methodClicker"><span class="sigClassName">EditSession.</span><span class="sigMemberName">addGutterDecoration</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="argument methodClicker" title="Number" data-id="Number">Number</a> row, <a href="http://www.nodemanual.org/latest/js_doc/String.html" class="argument methodClicker" title="String" data-id="String">String</a> className</span>)
+                                  <li class="signature-returns">
+                                    <ul class="argument-types">
+                                      <li class="argument-type"><span class="returnType " title="EditSession.addGutterDecoration (class method)">Void</span></li>
+                                    </ul>
+                                  </li></li>
+                              </ul>
+                              <ul class="metaInfo">
+                              </ul>
+                            </li>
+                          </ul>
+                        </div>
+                        <div class="sideToggler">
+                          <div id="ellipsis_EditSession.addGutterDecoration" class="ellipsis_description"><p>Adds <code>className</code> to the <code>row</code>, to be used for CSS stylings and whatnot.</p>
+
+                          </div>
+                          <div id="short_EditSession.addGutterDecoration" class="short_description hiddenSpan"><p>Adds <code>className</code> to the <code>row</code>, to be used for CSS stylings and whatnot.</p>
+
+                          </div>
+                          <h3 id="EditSession.addGutterDecoration" class="methodToggle methodClicker inactive">&nbsp;&nbsp;&nbsp;</h3>
+                          <div class="description">
+                            <h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">row</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="" title="Number" data-id="Number">Number</a></td><td class="argDescription ">Required. The row number</td></tr><tr class="argumentRow "><td class="argName ">className</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/String.html" class="" title="String" data-id="String">String</a></td><td class="argDescription ">Required. The class to add</td></tr></table>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </article>
                   <article id="EditSession.addMarker" data-title="EditSession.addMarker (class method)" class="article">
                     <div class="section method">
                       <div class="memberContent">
@@ -2090,6 +2128,40 @@
                       </div>
                     </div>
                   </article>
+                  <article id="EditSession.removeGutterDecoration" data-title="EditSession.removeGutterDecoration (class method)" class="article">
+                    <div class="section method">
+                      <div class="memberContent">
+                        <div class="title">
+                          <ul class="signatures">
+                            <li class="signature">
+                              <ul>
+                                <li class="signature-call"><span id="EditSession.removeGutterDecoration" class="member-name methodClicker"><span class="sigClassName">EditSession.</span><span class="sigMemberName">removeGutterDecoration</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="argument methodClicker" title="Number" data-id="Number">Number</a> row, <a href="http://www.nodemanual.org/latest/js_doc/String.html" class="argument methodClicker" title="String" data-id="String">String</a> className</span>)
+                                  <li class="signature-returns">
+                                    <ul class="argument-types">
+                                      <li class="argument-type"><span class="returnType " title="EditSession.removeGutterDecoration (class method)">Void</span></li>
+                                    </ul>
+                                  </li></li>
+                              </ul>
+                              <ul class="metaInfo">
+                              </ul>
+                            </li>
+                          </ul>
+                        </div>
+                        <div class="sideToggler">
+                          <div id="ellipsis_EditSession.removeGutterDecoration" class="ellipsis_description"><p>Removes <code>className</code> from the <code>row</code>.</p>
+
+                          </div>
+                          <div id="short_EditSession.removeGutterDecoration" class="short_description hiddenSpan"><p>Removes <code>className</code> from the <code>row</code>.</p>
+
+                          </div>
+                          <h3 id="EditSession.removeGutterDecoration" class="methodToggle methodClicker inactive">&nbsp;&nbsp;&nbsp;</h3>
+                          <div class="description">
+                            <h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">row</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="" title="Number" data-id="Number">Number</a></td><td class="argDescription ">Required. The row number</td></tr><tr class="argumentRow "><td class="argName ">className</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/String.html" class="" title="String" data-id="String">String</a></td><td class="argDescription ">Required. The class to add</td></tr></table>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </article>
                   <article id="EditSession.removeMarker" data-title="EditSession.removeMarker (class method)" class="article">
                     <div class="section method">
                       <div class="memberContent">
@@ -2227,7 +2299,7 @@
                           <ul class="signatures">
                             <li class="signature">
                               <ul>
-                                <li class="signature-call"><span id="EditSession.setBreakpoint" class="member-name methodClicker"><span class="sigClassName">EditSession.</span><span class="sigMemberName">setBreakpoint</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="argument methodClicker" title="Number" data-id="Number">Number</a> row</span>)</li>
+                                <li class="signature-call"><span id="EditSession.setBreakpoint" class="member-name methodClicker"><span class="sigClassName">EditSession.</span><span class="sigMemberName">setBreakpoint</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="argument methodClicker" title="Number" data-id="Number">Number</a> row, <a href="http://www.nodemanual.org/latest/js_doc/String.html" class="argument methodClicker" title="String" data-id="String">String</a> className</span>)</li>
                               </ul>
                               <ul class="metaInfo">
                               </ul>
@@ -2243,7 +2315,7 @@
                           </div>
                           <h3 id="EditSession.setBreakpoint" class="methodToggle methodClicker inactive">&nbsp;&nbsp;&nbsp;</h3>
                           <div class="description">
-                            <h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">row</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="" title="Number" data-id="Number">Number</a></td><td class="argDescription ">Required. A row index</td></tr></table>
+                            <h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">row</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="" title="Number" data-id="Number">Number</a></td><td class="argDescription ">Required. A row index</td></tr><tr class="argumentRow "><td class="argName ">className</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/String.html" class="" title="String" data-id="String">String</a></td><td class="argDescription ">Required. Class of the breakpoint</td></tr></table>
                           </div>
                         </div>
                       </div>
diff --git a/api/virtual_renderer.html b/api/virtual_renderer.html
index 0a2ac0e4..fe984572 100644
--- a/api/virtual_renderer.html
+++ b/api/virtual_renderer.html
@@ -284,7 +284,7 @@
                           <ul class="signatures">
                             <li class="signature">
                               <ul>
-                                <li class="signature-call"><span id="VirtualRenderer.addGutterDecoration" class="member-name methodClicker"><span class="sigClassName">VirtualRenderer.</span><span class="sigMemberName">addGutterDecoration</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="argument methodClicker" title="Number" data-id="Number">Number</a> row, <a href="http://www.nodemanual.org/latest/js_doc/String.html" class="argument methodClicker" title="String" data-id="String">String</a> className</span>)
+                                <li class="signature-call"><span id="VirtualRenderer.addGutterDecoration" class="member-name methodClicker"><span class="sigClassName">VirtualRenderer.</span><span class="sigMemberName">addGutterDecoration</span></span>(<span class="sigArgList">row, className</span>)
                                   <li class="signature-returns">
                                     <ul class="argument-types">
                                       <li class="argument-type"><span class="returnType " title="VirtualRenderer.addGutterDecoration (class method)">Void</span></li>
@@ -297,15 +297,14 @@
                           </ul>
                         </div>
                         <div class="sideToggler">
-                          <div id="ellipsis_VirtualRenderer.addGutterDecoration" class="ellipsis_description"><p>Adds <code>className</code> to the <code>row</code>, to be used for CSS stylings and whatnot.</p>
+                          <div id="ellipsis_VirtualRenderer.addGutterDecoration" class="ellipsis_description"><p>Deprecated (moved to EditSession)</p>
 
                           </div>
-                          <div id="short_VirtualRenderer.addGutterDecoration" class="short_description hiddenSpan"><p>Adds <code>className</code> to the <code>row</code>, to be used for CSS stylings and whatnot.</p>
+                          <div id="short_VirtualRenderer.addGutterDecoration" class="short_description hiddenSpan"><p>Deprecated (moved to EditSession)</p>
 
                           </div>
                           <h3 id="VirtualRenderer.addGutterDecoration" class="methodToggle methodClicker inactive">&nbsp;&nbsp;&nbsp;</h3>
                           <div class="description">
-                            <h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">row</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="" title="Number" data-id="Number">Number</a></td><td class="argDescription ">Required. The row number</td></tr><tr class="argumentRow "><td class="argName ">className</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/String.html" class="" title="String" data-id="String">String</a></td><td class="argDescription ">Required. The class to add</td></tr></table>
                           </div>
                         </div>
                       </div>
@@ -1109,7 +1108,7 @@
                           <ul class="signatures">
                             <li class="signature">
                               <ul>
-                                <li class="signature-call"><span id="VirtualRenderer.removeGutterDecoration" class="member-name methodClicker"><span class="sigClassName">VirtualRenderer.</span><span class="sigMemberName">removeGutterDecoration</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="argument methodClicker" title="Number" data-id="Number">Number</a> row, <a href="http://www.nodemanual.org/latest/js_doc/String.html" class="argument methodClicker" title="String" data-id="String">String</a> className</span>)
+                                <li class="signature-call"><span id="VirtualRenderer.removeGutterDecoration" class="member-name methodClicker"><span class="sigClassName">VirtualRenderer.</span><span class="sigMemberName">removeGutterDecoration</span></span>(<span class="sigArgList">row, className</span>)
                                   <li class="signature-returns">
                                     <ul class="argument-types">
                                       <li class="argument-type"><span class="returnType " title="VirtualRenderer.removeGutterDecoration (class method)">Void</span></li>
@@ -1122,15 +1121,14 @@
                           </ul>
                         </div>
                         <div class="sideToggler">
-                          <div id="ellipsis_VirtualRenderer.removeGutterDecoration" class="ellipsis_description"><p>Removes <code>className</code> from the <code>row</code>.</p>
+                          <div id="ellipsis_VirtualRenderer.removeGutterDecoration" class="ellipsis_description"><p>Deprecated (moved to EditSession)</p>
 
                           </div>
-                          <div id="short_VirtualRenderer.removeGutterDecoration" class="short_description hiddenSpan"><p>Removes <code>className</code> from the <code>row</code>.</p>
+                          <div id="short_VirtualRenderer.removeGutterDecoration" class="short_description hiddenSpan"><p>Deprecated (moved to EditSession)</p>
 
                           </div>
                           <h3 id="VirtualRenderer.removeGutterDecoration" class="methodToggle methodClicker inactive">&nbsp;&nbsp;&nbsp;</h3>
                           <div class="description">
-                            <h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">row</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="" title="Number" data-id="Number">Number</a></td><td class="argDescription ">Required. The row number</td></tr><tr class="argumentRow "><td class="argName ">className</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/String.html" class="" title="String" data-id="String">String</a></td><td class="argDescription ">Required. The class to add</td></tr></table>
                           </div>
                         </div>
                       </div>
diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 9aa75376..4723c0a9 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -571,9 +571,9 @@ var EditSession = function(text, mode) {
     };
 
     /**
-    * EditSession.setBreakpoint(row)
+    * EditSession.setBreakpoint(row, className)
     * - row (Number): A row index
-    * - className: class of the breakpoint
+    * - className (String): Class of the breakpoint
     *
     * Sets a breakpoint on the row number given by `rows`. This function also emites the `'changeBreakpoint'` event.
     **/