diff --git a/doc/mxml.man b/doc/mxml.man
index 9365d16..7eeac09 100644
--- a/doc/mxml.man
+++ b/doc/mxml.man
@@ -1,4 +1,4 @@
-.TH mxml 3 "Mini-XML API" "05/01/17" "Mini-XML API"
+.TH mxml 3 "Mini-XML API" "05/02/17" "Mini-XML API"
 .SH NAME
 mxml \- Mini-XML API
 .SH INCLUDE FILE
diff --git a/mmd.c b/mmd.c
index 38c2840..acacd86 100644
--- a/mmd.c
+++ b/mmd.c
@@ -706,7 +706,7 @@ mmd_parse_inline(mmd_t *parent,         /* I - Parent node */
 
       whitespace = 1;
     }
-    else if (*lineptr == '!' && lineptr[1] == '[')
+    else if (*lineptr == '!' && lineptr[1] == '[' && type != MMD_TYPE_CODE_TEXT)
     {
      /*
       * Image...
@@ -732,7 +732,7 @@ mmd_parse_inline(mmd_t *parent,         /* I - Parent node */
       whitespace = 0;
       lineptr --;
     }
-    else if (*lineptr == '[')
+    else if (*lineptr == '[' && type != MMD_TYPE_CODE_TEXT)
     {
      /*
       * Link...
@@ -768,7 +768,7 @@ mmd_parse_inline(mmd_t *parent,         /* I - Parent node */
       whitespace = 0;
       lineptr --;
     }
-    else if (*lineptr == '<' && strchr(lineptr + 1, '>'))
+    else if (*lineptr == '<' && type != MMD_TYPE_CODE_TEXT && strchr(lineptr + 1, '>'))
     {
      /*
       * Autolink...
diff --git a/mxmldoc.c b/mxmldoc.c
index 1535273..cb294f5 100644
--- a/mxmldoc.c
+++ b/mxmldoc.c
@@ -1436,7 +1436,9 @@ markdown_anchor(const char *text)	/* I - Title text */
   for (bufptr = buffer; *text && bufptr < (buffer + sizeof(buffer) - 1); text ++)
   {
     if ((*text >= '0' && *text <= '9') || (*text >= 'a' && *text <= 'z') || (*text >= 'A' && *text <= 'Z') || *text == '.' || *text == '-')
-      *bufptr++ = *text;
+      *bufptr++ = (char)tolower(*text);
+    else if (*text == ' ')
+      *bufptr++ = '-';
   }
 
   *bufptr = '\0';
@@ -1597,7 +1599,12 @@ markdown_write_block(FILE  *out,	/* I - Output file */
 
       fprintf(out, "    <%s><a id=\"", element);
       for (node = mmdGetFirstChild(parent); node; node = mmdGetNextSibling(node))
+      {
+        if (mmdGetWhitespace(node))
+          fputc('-', out);
+
         fputs(markdown_anchor(mmdGetText(node)), out);
+      }
       fputs("\">", out);
     }
     else if (element)