diff --git a/README.md b/README.md
index 6b4e1e956..b21cd8e82 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,6 @@ Here is the **[FAQ](https://github.com/Pita/etherpad-lite/wiki/FAQ)**
       <li>Move into the node folder <code>cd node-v0.6*</code> and build node with <code>./configure && make && make install</code></li>
     </ol>
   </li>
-  <li>Install npm <code>curl http://npmjs.org/install.sh | sh</code></li>
 </ol>
 
 **As any user (we recommend creating a separate user called etherpad-lite):**
diff --git a/static/css/iframe_editor.css b/static/css/iframe_editor.css
index 4385fff0c..f6366f3b9 100644
--- a/static/css/iframe_editor.css
+++ b/static/css/iframe_editor.css
@@ -32,24 +32,24 @@ ul.list-bullet6 { list-style-type: square; }
 ul.list-bullet7 { list-style-type: disc; }
 ul.list-bullet8 { list-style-type: circle; }
 
-ul.list-number1 { margin-left: 1.5em; }
-ul.list-number2 { margin-left: 3em; }
-ul.list-number3 { margin-left: 4.5em; }
-ul.list-number4 { margin-left: 6em; }
-ul.list-number5 { margin-left: 7.5em; }
-ul.list-number6 { margin-left: 9em; }
-ul.list-number7 { margin-left: 10.5em; }
-ul.list-number8 { margin-left: 12em; }
+ol.list-number1 { margin-left: 1.5em; }
+ol.list-number2 { margin-left: 3em; }
+ol.list-number3 { margin-left: 4.5em; }
+ol.list-number4 { margin-left: 6em; }
+ol.list-number5 { margin-left: 7.5em; }
+ol.list-number6 { margin-left: 9em; }
+ol.list-number7 { margin-left: 10.5em; }
+ol.list-number8 { margin-left: 12em; }
 
-ul { list-style-type: disc; }
-ul.list-number1 { list-style-type: decimal; }
-ul.list-number2 { list-style-type: lower-latin; }
-ul.list-number3 { list-style-type: lower-roman; }
-ul.list-number4 { list-style-type: decimal; }
-ul.list-number5 { list-style-type: lower-latin; }
-ul.list-number6 { list-style-type: lower-roman; }
-ul.list-number7 { list-style-type: decimal; }
-ul.list-number8 { list-style-type: lower-latin; }
+ol { list-style-type: disc; }
+ol.list-number1 { list-style-type: decimal; }
+ol.list-number2 { list-style-type: lower-latin; }
+ol.list-number3 { list-style-type: lower-roman; }
+ol.list-number4 { list-style-type: decimal; }
+ol.list-number5 { list-style-type: lower-latin; }
+ol.list-number6 { list-style-type: lower-roman; }
+ol.list-number7 { list-style-type: decimal; }
+ol.list-number8 { list-style-type: lower-latin; }
 
 ul.list-indent1 { margin-left: 1.5em; }
 ul.list-indent2 { margin-left: 3em; }
diff --git a/static/js/domline.js b/static/js/domline.js
index dce45f48a..f081f7df3 100644
--- a/static/js/domline.js
+++ b/static/js/domline.js
@@ -96,8 +96,16 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
         start = start?'start="'+start[1]+'"':'';
         if (listType)
         {
-          preHtml = '<ul '+start+' class="list-' + listType + '"><li>';
-          postHtml = '</li></ul>';
+          if(listType.indexOf("number") < 0)
+          {
+            preHtml = '<ul class="list-' + listType + '"><li>';
+            postHtml = '</li></ul>';
+          }
+          else
+          {
+            preHtml = '<ol '+start+' class="list-' + listType + '"><li>';
+            postHtml = '</li></ol>';
+          }
         }
         result.lineMarker += txt.length;
         return; // don't append any text