diff --git a/lib/marked.js b/lib/marked.js
index 9e763216..f234478c 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -17,7 +17,7 @@ var block = {
   lheading: /^([^\n]+)\n *(=|-){3,}/,
   blockquote: /^ *>[^\n]*(?:\n *>[^\n]*)*/,
   list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1\2|\d+\.)/,
-  html: /^<[^>\n]+> *(?:\n{2}|\s*$)|^<([^\/\s>]+)[^\n>]*>[^\n]*(?:\n[^\n]+)*\n?<\/\1>/,
+  html: /^(?:<!--[^\0]*?-->|<[^>\n]+>|<([^\/\s>]+)[^\n>]*>[^\n]*(?:\n[^\n]+)*\n?<\/\1>) *(?:\n{2}|\s*$)/,
   text: /^[^\n]+/
 };
 
@@ -183,7 +183,7 @@ block.token = function(str, tokens) {
 var inline = {
   escape: /^\\([\\`*{}\[\]()#+\-.!_])/,
   autolink: /^<([^ >]+(@|:\/)[^ >]+)>/,
-  tag: /^<[^\n>]+>/,
+  tag: /^<!--[^\0]*?-->|^<[^\n>]+>/,
   link: /^!?\[([^\]]+)\]\s*\(([^\)]*)\)/,
   reflink: /^!?\[([^\]]+)\]\s*\[([^\]]*)\]/,
   strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,