diff --git a/lib/renderer.js b/lib/renderer.js
index f455195..b3877bb 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -17,6 +17,16 @@ function Renderer() {
 
 require('util').inherits(Renderer, kramedRenderer);
 
+// Support To-Do List
+Renderer.prototype.listitem = function(text) {
+   if (/^\s*\[[x ]\]\s*/.test(text)) {
+     text = text.replace(/^\s*\[ \]\s*/, '<input type="checkbox"></input> ').replace(/^\s*\[x\]\s*/, '<input type="checkbox" checked></input> ');
+     return '<li style="list-style: none">' + text + '</li>\n';
+   } else {
+     return '<li>' + text + '</li>\n';
+   }
+ };
+
 // Add id attribute to headings
 Renderer.prototype.heading = function(text, level) {
   var id = anchorId(stripHTML(text));
diff --git a/test/index.js b/test/index.js
index 1bf3551..fbb6901 100644
--- a/test/index.js
+++ b/test/index.js
@@ -59,3 +59,28 @@ describe('Kramed renderer', function() {
     result.should.eql('<h1 id="中文"><a href="#中文" class="headerlink" title="中文"></a>中文</h1>');
   });
 });
+
+ it('to-do list testing', function() {
+    var body = [
+      '- [ ] test unchecked',
+      '- [x] test checked',
+      '- normal list [x] [ ]',
+      '',
+      'normal text [x] [ ]',
+      '',
+      '[x] [ ] normal text'
+     ].join('\n');
+
+  var result = r({text: body});
+
+   result.should.eql([
+     '<ul>',
+     '<li style="list-style: none"><input type="checkbox"></input> test unchecked</li>',
+     '<li style="list-style: none"><input type="checkbox" checked></input> test checked</li>',
+     '<li>normal list [x] [ ]</li>',
+     '</ul>',
+     '<p>normal text [x] [ ]</p>',
+      '<p>[x] [ ] normal text</p>'
+     ].join('\n') + '\n');
+  });
+