diff --git a/REQUIRE b/REQUIRE
index 494e081..13aae8f 100644
--- a/REQUIRE
+++ b/REQUIRE
@@ -4,3 +4,4 @@ JLD
 JSON
 Highlights
 Mustache
+Documenter
diff --git a/src/format.jl b/src/format.jl
index dbd80bd..ec707a6 100644
--- a/src/format.jl
+++ b/src/format.jl
@@ -1,4 +1,4 @@
-import Mustache, Highlights
+import Mustache, Highlights, Documenter
 
 function format(doc::WeaveDoc)
     formatted = AbstractString[]
@@ -61,7 +61,8 @@ end
 
 function format_chunk(chunk::DocChunk, formatdict, docformat::JMarkdown2HTML)
     m = Base.Markdown.parse(chunk.content)
-    return Base.Markdown.html(m)
+    #Base.Markdown.html(m)
+    return string(Documenter.Writers.HTMLWriter.mdconvert(m))
 end
 
 
diff --git a/templates/julia_html.txt b/templates/julia_html.txt
index 31bd162..a48b5b0 100644
--- a/templates/julia_html.txt
+++ b/templates/julia_html.txt
@@ -6,6 +6,14 @@
 
   {{{ :header_script }}}
 
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
+
+  <script src='https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'></script>
+
   <style type="text/css">
   {{{ :themecss }}}
   {{{ :highlightcss }}}