diff --git a/README.md b/README.md
index 34f9878..980b176 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,18 @@ let g:vimwiki_list = [{
 	\ 'template_ext': '.tpl'}]
 ```
 
+## Markdown extensions
+
+The following [markdown extensions](https://python-markdown.github.io/extensions/)
+are activated by default:
+
+- [fenced_code](https://python-markdown.github.io/extensions/fenced_code_blocks/)
+- [tables](https://python-markdown.github.io/extensions/tables/)
+- [CodeHilite](https://python-markdown.github.io/extensions/code_hilite/)
+
+But you can add more extensions using `VIMWIKI_MARKDOWN_EXTENSIONS` environment
+variable, which is a coma separated list of extensions.
+
 ## Syntax highlighting
 
 Syntax highlighting is provided by [Pygments](http://pygments.org/), which will
diff --git a/setup.py b/setup.py
index 7df86e8..ba13ffc 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
     "vimwiki markdown file to html with syntax highlighting.",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="0.1.1",
+    version="0.2.0",
     py_modules=["vimwiki_markdown"],
     packages=[],
     package_data={},
diff --git a/vimwiki_markdown.py b/vimwiki_markdown.py
index ade807f..a86ce74 100644
--- a/vimwiki_markdown.py
+++ b/vimwiki_markdown.py
@@ -69,8 +69,12 @@ def main():
     filename, _ = os.path.splitext(os.path.basename(INPUT_FILE))
     output_file = os.path.join(OUTPUT_DIR, filename + ".html")
 
+    extensions = ["fenced_code", "tables"]
+    extensions += os.getenv("VIMWIKI_MARKDOWN_EXTENSIONS", "").split(",")
+    extensions = set([e for e in extensions if e] + [CodeHiliteExtension()])
+
     # Setup markdown parser
-    md = markdown.Markdown(extensions=["fenced_code", CodeHiliteExtension()])
+    md = markdown.Markdown(extensions=extensions)
     md.inlinePatterns.deregister("link")
     md.inlinePatterns.register(
         LinkInlineProcessor(markdown.inlinepatterns.LINK_RE, md), "link", 160