diff --git a/dist/htmlParser.es6.js b/dist/htmlParser.es6.js
index e61684c..83e52f8 100644
--- a/dist/htmlParser.es6.js
+++ b/dist/htmlParser.es6.js
@@ -136,6 +136,11 @@ function tokenize(html) {
   const maxTime = Date.now() + 1000;
 
   while (string) {
+    if (string.indexOf("<!--") === 0) {
+      const lastIndex = string.indexOf("-->") + 3;
+      string = string.substring(lastIndex);
+      continue
+    }
     if (string.indexOf("</") === 0) {
       const match = string.match(ENDTAG_REX);
       if (!match) continue
diff --git a/dist/htmlParser.js b/dist/htmlParser.js
index 3023fec..b6ab759 100644
--- a/dist/htmlParser.js
+++ b/dist/htmlParser.js
@@ -220,6 +220,11 @@ function tokenize(html) {
   var maxTime = Date.now() + 1000;
 
   while (string) {
+    if (string.indexOf("<!--") === 0) {
+      var lastIndex = string.indexOf("-->") + 3;
+      string = string.substring(lastIndex);
+      continue;
+    }
     if (string.indexOf("</") === 0) {
       var match = string.match(ENDTAG_REX);
       if (!match) continue;
diff --git a/dist/htmlParser.min.js b/dist/htmlParser.min.js
index 6e28ee9..52b2fc3 100644
--- a/dist/htmlParser.min.js
+++ b/dist/htmlParser.min.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.htmlParser=t()}(this,function(){"use strict";function e(e){return e.split(",").reduce(function(e,t){return e[t]=!0,e},{})}function t(e){return!!l[e]}function n(e){return!!p[e]}function r(e){var t=e.name,n=e.attributes;return e instanceof g?{type:_,tagName:t,attributes:n}:{type:_,tagName:t,attributes:n,children:[]}}function i(e){var t=e.text;return{type:O,content:t}}function o(e,t){switch(e){case _:return r(t);case O:return i(t)}}function a(e){var t={tag:"root",children:[]},n=[t];n.last=function(){return n[n.length-1]};for(var r=0;r<e.length;r++){var i=e[r];if(i instanceof y){var a=o(_,i);a.children?n.push(a):n.last().children.push(a)}else if(i instanceof v){var u=n[n.length-2],c=n.pop();u.children.push(c)}else i instanceof w&&n.last().children.push(o(O,i))}return t}function u(e){for(var n=e,r=[],i=Date.now()+1e3;n;)if(0!==n.indexOf("</"))if(0!==n.indexOf("<")){var o=n.indexOf("<"),a=o<0?n:n.substring(0,o);if(n=o<0?"":n.substring(o),r.push(new w(a)),Date.now()>=i)break}else{var u=n.match(s);if(!u)continue;n=n.substring(u[0].length);var c=u[1],l=u[2],p=t(c)?new g(c,l):new y(c,l);r.push(p)}else{var h=n.match(f);if(!h)continue;n=n.substring(h[0].length);var b=h[1];if(t(b))continue;r.push(new v(b))}return r}function c(e){return a(u(e))}var s=/^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,f=/^<\/([-A-Za-z0-9_]+)[^>]*>/,l=e("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr"),p=e("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),h=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},b=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),d=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)},m=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t},y=function(){function e(t,n){h(this,e),this.name=t,this.attributes=this.getAttributes(n)}return b(e,[{key:"getAttributes",value:function(e){var t={};return e.replace(/([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g,function(e,r){var i=Array.prototype.slice.call(arguments),o=i[2]?i[2]:i[3]?i[3]:i[4]?i[4]:n(r)?r:"";t[r]=o.replace(/(^|[^\\])"/g,'$1\\"')}),t}}]),e}(),g=function(e){function t(e,n){return h(this,t),m(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,n))}return d(t,e),t}(y),v=function e(t){h(this,e),this.name=t},w=function e(t){h(this,e),this.text=t},_="Element",O="Text";return c});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.htmlParser=t()}(this,function(){"use strict";function e(e){return e.split(",").reduce(function(e,t){return e[t]=!0,e},{})}function t(e){return!!l[e]}function n(e){return!!p[e]}function r(e){var t=e.name,n=e.attributes;return e instanceof g?{type:_,tagName:t,attributes:n}:{type:_,tagName:t,attributes:n,children:[]}}function i(e){var t=e.text;return{type:x,content:t}}function o(e,t){switch(e){case _:return r(t);case x:return i(t)}}function a(e){var t={tag:"root",children:[]},n=[t];n.last=function(){return n[n.length-1]};for(var r=0;r<e.length;r++){var i=e[r];if(i instanceof y){var a=o(_,i);a.children?n.push(a):n.last().children.push(a)}else if(i instanceof v){var u=n[n.length-2],s=n.pop();u.children.push(s)}else i instanceof w&&n.last().children.push(o(x,i))}return t}function u(e){for(var n=e,r=[],i=Date.now()+1e3;n;)if(0!==n.indexOf("\x3c!--"))if(0!==n.indexOf("</"))if(0!==n.indexOf("<")){var o=n.indexOf("<"),a=o<0?n:n.substring(0,o);if(n=o<0?"":n.substring(o),r.push(new w(a)),Date.now()>=i)break}else{var u=n.match(c);if(!u)continue;n=n.substring(u[0].length);var s=u[1],l=u[2],p=t(s)?new g(s,l):new y(s,l);r.push(p)}else{var h=n.match(f);if(!h)continue;n=n.substring(h[0].length);var b=h[1];if(t(b))continue;r.push(new v(b))}else{var d=n.indexOf("--\x3e")+3;n=n.substring(d)}return r}function s(e){return a(u(e))}var c=/^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,f=/^<\/([-A-Za-z0-9_]+)[^>]*>/,l=e("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr"),p=e("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),h=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},b=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),d=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)},m=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t},y=function(){function e(t,n){h(this,e),this.name=t,this.attributes=this.getAttributes(n)}return b(e,[{key:"getAttributes",value:function(e){var t={};return e.replace(/([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g,function(e,r){var i=Array.prototype.slice.call(arguments),o=i[2]?i[2]:i[3]?i[3]:i[4]?i[4]:n(r)?r:"";t[r]=o.replace(/(^|[^\\])"/g,'$1\\"')}),t}}]),e}(),g=function(e){function t(e,n){return h(this,t),m(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,n))}return d(t,e),t}(y),v=function e(t){h(this,e),this.name=t},w=function e(t){h(this,e),this.text=t},_="Element",x="Text";return s});
diff --git a/src/tokenizer/index.js b/src/tokenizer/index.js
index 565ec3e..cc1a9d0 100644
--- a/src/tokenizer/index.js
+++ b/src/tokenizer/index.js
@@ -8,6 +8,11 @@ export function tokenize(html) {
   const maxTime = Date.now() + 1000
 
   while (string) {
+    if (string.indexOf("<!--") === 0) {
+      const lastIndex = string.indexOf("-->") + 3
+      string = string.substring(lastIndex)
+      continue
+    }
     if (string.indexOf("</") === 0) {
       const match = string.match(ENDTAG_REX)
       if (!match) continue
diff --git a/test/index.js b/test/index.js
index f3d8fef..b3700bc 100644
--- a/test/index.js
+++ b/test/index.js
@@ -38,6 +38,12 @@ test('should pass the empty tag case', t=> {
   t.deepEqual(div.children[0], br)
 })
 
+test('should pass the comment case', t=> {
+  const html = "<div><!-- hahha--></div>"
+  const div = htmlParser(html).children[0]
+  t.deepEqual(div.children.length, 0)
+})
+
 test('should pass the nested element case', t=> {
   const html = "<div>a<p>b<span>c</span></p></div>"
   const tree = {