diff --git a/example/advanced.html b/example/advanced.html
index e13cab1..883e130 100644
--- a/example/advanced.html
+++ b/example/advanced.html
@@ -52,6 +52,7 @@
                 <th>First Name</th>
                 <th>Last Name</th>
                 <th>DOB</th>
+                <th>City</th>
             </tr>
         </thead>
         <tbody>
@@ -59,61 +60,73 @@
                 <td>Elliott</td>
                 <td>Beaty</td>
                 <td>01/14/2011</td>
+                <td>New York</td>
             </tr>
             <tr>
                 <td>Joe</td>
                 <td>Dirt</td>
                 <td>01/14/2004</td>
+                <td>London</td>
             </tr>
             <tr>
                 <td>John</td>
                 <td>Doe</td>
                 <td>01/14/2003</td>
+                <td>Mumbai</td>
             </tr>
             <tr>
                 <td>Jane</td>
                 <td>Doe</td>
                 <td>01/11/2001</td>
+                <td>Sydney</td>
             </tr>
             <tr>
                 <td>Billy</td>
                 <td>Bob</td>
                 <td>02/14/1947</td>
+                <td>New York</td>
             </tr>
             <tr>
                 <td>Bobby</td>
                 <td>Axlerod</td>
                 <td>01/27/2001</td>
+                <td>London</td>
             </tr>
             <tr>
                 <td>Elliott</td>
                 <td>Beaty</td>
                 <td>01/13/2007</td>
+                <td>Mumbai</td>
             </tr>
             <tr>
                 <td>Joe</td>
                 <td>Dirt</td>
                 <td>01/14/2001</td>
+                <td>Sydney</td>
             </tr>
             <tr>
                 <td>John</td>
                 <td>Doe</td>
                 <td>01/14/2001</td>
+                <td>New York</td>
             </tr>
             <tr>
                 <td>Jane</td>
                 <td>Doe</td>
                 <td>01/14/2001</td>
+                <td>London</td>
             </tr>
             <tr>
                 <td>Billy</td>
                 <td>Bob</td>
                 <td>01/14/2001</td>
+                <td>Mumbai</td>
             </tr>
             <tr>
                 <td>Bobby</td>
                 <td>Axlerod</td>
                 <td>01/14/2001</td>
+                <td>Sydney</td>
             </tr>
         </tbody>
     </table>
diff --git a/example/advanced.js b/example/advanced.js
index 076260a..2c6c6ef 100644
--- a/example/advanced.js
+++ b/example/advanced.js
@@ -34,9 +34,20 @@ $(document).ready(function () {
                 "options": {
                     "icon": "http://jqueryui.com/resources/demos/datepicker/images/calendar.gif" // Optional
                 }
-            }
+            },
              // Nothing specified for column 3 so it will default to text
-            
+            {
+                "column":3,
+                "type": "datalist",
+                "options":[
+                    { "value": "New York" },
+                    { "value": "London, UK" },
+                    { "value": "London, Canada" },
+                    { "value": "Mumbai" },
+                    { "value": "New Delhi" },
+                    { "value": "Sydney" }
+                ]
+            }
         ]
     });
 
@@ -53,4 +64,4 @@ function destroyTable() {
         table.destroy();
         table.MakeCellsEditable("destroy");
     }
-}
\ No newline at end of file
+}
diff --git a/js/dataTables.cellEdit.js b/js/dataTables.cellEdit.js
index 7b0448b..f92da80 100644
--- a/js/dataTables.cellEdit.js
+++ b/js/dataTables.cellEdit.js
@@ -135,13 +135,13 @@ function getInputHtml(currentColumnIndex, settings, oldValue) {
     input = {"focus":true,"html":null};
 
     if(settings.inputTypes){
-		$.each(settings.inputTypes, function (index, setting) {
-			if (setting.column == currentColumnIndex) {
-				inputSetting = setting;
-				inputType = inputSetting.type.toLowerCase();
-			}
-		});
-	}
+        $.each(settings.inputTypes, function (index, setting) {
+            if (setting.column == currentColumnIndex) {
+                inputSetting = setting;
+                inputType = inputSetting.type.toLowerCase();
+            }
+        });
+    }
 
     if (settings.inputCss) { inputCss = settings.inputCss; }
     if (settings.wrapperHtml) {
@@ -183,6 +183,46 @@ function getInputHtml(currentColumnIndex, settings, oldValue) {
             input.html = input.html + "</select>&nbsp;<a href='javascript:void(0);' class='" + confirmCss + "' onclick='$(this).updateEditableCell(this);'>Confirm</a> <a href='javascript:void(0);' class='" + cancelCss + "' onclick='$(this).cancelEditableCell(this)'>Cancel</a>" + endWrapperHtml;
             input.focus = false;
             break;
+        case "datalist":
+            if (!startWrapperHtml) {
+                startWrapperHtml = '<div>'
+                endWrapperHtml = '</div>'
+            }
+            input.html = startWrapperHtml + "<input id='ejbeatycelledit' list='datalist-" + currentColumnIndex + "' class='" + inputCss + "' value='" + oldValue + "' onfocusout='$(this).updateEditableCell(this);'>";
+            input.html = input.html + "</input>";
+            input.html = input.html + "<datalist id='datalist-" + currentColumnIndex + "'>";
+
+            $.each(inputSetting.options, function (index, option) {
+                if (oldValue == option.value) {
+                   input.html = input.html + "<option value='" + option.value + "'>"
+                } else {
+                   input.html = input.html + "<option value='" + option.value + "' >"
+                }
+            });
+            input.html = input.html + "</datalist>";
+            input.html = input.html + endWrapperHtml;
+            input.focus = true;
+            break;
+        case "datalist-confirm": // DataList w/ confirm
+            if (!startWrapperHtml) {
+                startWrapperHtml = '<div>'
+                endWrapperHtml = '</div>'
+            }
+            input.html = startWrapperHtml + "<input id='ejbeatycelledit' list='datalist-" + currentColumnIndex + "' class='" + inputCss + "' value='" + oldValue + "'>";
+            input.html = input.html + "</input>";
+            input.html = input.html + "<datalist id='datalist-" + currentColumnIndex + "'>";
+
+            $.each(inputSetting.options, function (index, option) {
+                if (oldValue == option.value) {
+                   input.html = input.html + "<option value='" + option.value + "' selected>"
+                } else {
+                   input.html = input.html + "<option value='" + option.value + "' >"
+                }
+            });
+            input.html = input.html + "</datalist>";
+            input.html = input.html + "&nbsp;<a href='javascript:void(0);' class='" + confirmCss + "' onclick='$(this).updateEditableCell(this);'>Confirm</a> <a href='javascript:void(0);' class='" + cancelCss + "' onclick='$(this).cancelEditableCell(this)'>Cancel</a>"+ endWrapperHtml;
+            input.focus = true;
+            break;
         case "datepicker": //Both datepicker options work best when confirming the values
         case "datepicker-confirm":
             // Makesure jQuery UI is loaded on the page
@@ -190,23 +230,23 @@ function getInputHtml(currentColumnIndex, settings, oldValue) {
                 alert("jQuery UI is required for the DatePicker control but it is not loaded on the page!");
                 break;
             }
-	        jQuery(".datepick").datepicker("destroy");
-	        input.html = startWrapperHtml + "<input id='ejbeatycelledit' type='text' name='date' class='datepick " + inputCss + "'   value='" + oldValue + "'></input> &nbsp;<a href='javascript:void(0);' class='" + confirmCss + "' onclick='$(this).updateEditableCell(this)'>Confirm</a> <a href='javascript:void(0);' class='" + cancelCss + "' onclick='$(this).cancelEditableCell(this)'>Cancel</a>" + endWrapperHtml;
-	        setTimeout(function () { //Set timeout to allow the script to write the input.html before triggering the datepicker
-	            var icon = "http://jqueryui.com/resources/demos/datepicker/images/calendar.gif";
+            jQuery(".datepick").datepicker("destroy");
+            input.html = startWrapperHtml + "<input id='ejbeatycelledit' type='text' name='date' class='datepick " + inputCss + "'   value='" + oldValue + "'></input> &nbsp;<a href='javascript:void(0);' class='" + confirmCss + "' onclick='$(this).updateEditableCell(this)'>Confirm</a> <a href='javascript:void(0);' class='" + cancelCss + "' onclick='$(this).cancelEditableCell(this)'>Cancel</a>" + endWrapperHtml;
+            setTimeout(function () { //Set timeout to allow the script to write the input.html before triggering the datepicker
+                var icon = "http://jqueryui.com/resources/demos/datepicker/images/calendar.gif";
                 // Allow the user to provide icon
-	            if (typeof inputSetting.options !== 'undefined' && typeof inputSetting.options.icon !== 'undefined') {
-	                icon = inputSetting.options.icon;
-	            }
-	            var self = jQuery('.datepick').datepicker(
+                if (typeof inputSetting.options !== 'undefined' && typeof inputSetting.options.icon !== 'undefined') {
+                    icon = inputSetting.options.icon;
+                }
+                var self = jQuery('.datepick').datepicker(
                     {
                         showOn: "button",
                         buttonImage: icon,
                         buttonImageOnly: true,
                         buttonText: "Select date"
                     });
-	        },100);
-	        break;
+            },100);
+            break;
         case "text-confirm": // text input w/ confirm
             input.html = startWrapperHtml + "<input id='ejbeatycelledit' class='" + inputCss + "' value='"+oldValue+"'" + (listenToKeys ? " onkeyup='if(event.keyCode==13) {$(this).updateEditableCell(this);} else if (event.keyCode===27) {$(this).cancelEditableCell(this);}'" : "") + "></input>&nbsp;<a href='javascript:void(0);' class='" + confirmCss + "' onclick='$(this).updateEditableCell(this)'>Confirm</a> <a href='javascript:void(0);' class='" + cancelCss + "' onclick='$(this).cancelEditableCell(this)'>Cancel</a>" + endWrapperHtml;
             break;
@@ -217,9 +257,9 @@ function getInputHtml(currentColumnIndex, settings, oldValue) {
         case "textarea-confirm":
             input.html = startWrapperHtml + "<textarea id='ejbeatycelledit' class='" + inputCss + "'>"+oldValue+"</textarea><a href='javascript:void(0);' class='" + confirmCss + "' onclick='$(this).updateEditableCell(this)'>Confirm</a> <a href='javascript:void(0);' class='" + cancelCss + "' onclick='$(this).cancelEditableCell(this)'>Cancel</a>" + endWrapperHtml;
             break;
-	case "number-confirm" :
-	    input.html = startWrapperHtml + "<input id='ejbeatycelledit' type='number' class='" + inputCss + "' value='"+oldValue+"'" + (listenToKeys ? " onkeyup='if(event.keyCode==13) {$(this).updateEditableCell(this);} else if (event.keyCode===27) {$(this).cancelEditableCell(this);}'" : "") + "></input>&nbsp;<a href='javascript:void(0);' class='" + confirmCss + "' onclick='$(this).updateEditableCell(this)'>Confirm</a> <a href='javascript:void(0);' class='" + cancelCss + "' onclick='$(this).cancelEditableCell(this)'>Cancel</a>" + endWrapperHtml;
-	    break;
+        case "number-confirm" :
+            input.html = startWrapperHtml + "<input id='ejbeatycelledit' type='number' class='" + inputCss + "' value='"+oldValue+"'" + (listenToKeys ? " onkeyup='if(event.keyCode==13) {$(this).updateEditableCell(this);} else if (event.keyCode===27) {$(this).cancelEditableCell(this);}'" : "") + "></input>&nbsp;<a href='javascript:void(0);' class='" + confirmCss + "' onclick='$(this).updateEditableCell(this)'>Confirm</a> <a href='javascript:void(0);' class='" + cancelCss + "' onclick='$(this).cancelEditableCell(this)'>Cancel</a>" + endWrapperHtml;
+            break;
         default: // text input
             input.html = startWrapperHtml + "<input id='ejbeatycelledit' class='" + inputCss + "' onfocusout='$(this).updateEditableCell(this)' value='" + oldValue + "'></input>" + endWrapperHtml;
             break;