=== Changes
==================================================================
--- Changes	(revision 936)
+++ Changes	(local)
@@ -49,3 +49,5 @@
 1.0.7   2008-01-07T16:31:00
         - Encode isn't in core in all perls, add it to Makefile.PL
 
+1.0.8  2008-01-??T??:??:??
+        - Do not encode amps or angle brackets in HTML comments + test case. s
=== lib/Text/MultiMarkdown.pm
==================================================================
--- lib/Text/MultiMarkdown.pm	(revision 936)
+++ lib/Text/MultiMarkdown.pm	(local)
@@ -1488,6 +1488,18 @@
 #   $text =~ s{>(?![a-z/?\$!])}{>}gi;
 #   Causes problems...
 
+    # Remove encoding inside comments
+    $text =~ s{
+        (?<=<!--) # Begin comment
+        (.*?)     # Anything inside
+        (?=-->)   # End comments
+    }{
+        my $t = $1;
+        $t =~ s/&amp;/&/g;
+        $t =~ s/&lt;/</g;
+        $t;
+    }egsx;
+
     return $text;
 }
 
=== t/docs-multimarkdown/Amps and angles encoding-advanced.html
==================================================================
--- t/docs-multimarkdown/Amps and angles encoding-advanced.html	(revision 936)
+++ t/docs-multimarkdown/Amps and angles encoding-advanced.html	(local)
@@ -0,0 +1,8 @@
+<p>Test bare block &amp; &lt;  > <!-- Test & < sd > --> Test</p>
+
+<p>Test HTML block & < > <!-- Test & < sd > --> Test</p>
+
+<p>A larger bare block <!-- With a multi-line
+HTML comment inside it Containing & and < --></p>
+
+<p>footer</p>
=== t/docs-multimarkdown/Amps and angles encoding-advanced.text
==================================================================
--- t/docs-multimarkdown/Amps and angles encoding-advanced.text	(revision 936)
+++ t/docs-multimarkdown/Amps and angles encoding-advanced.text	(local)
@@ -0,0 +1,8 @@
+Test bare block & <  > <!-- Test & < sd > --> Test
+
+<p>Test HTML block & < > <!-- Test & < sd > --> Test</p>
+
+A larger bare block <!-- With a multi-line
+HTML comment inside it Containing & and < -->
+
+footer