diff --git a/common/framework/formatter.php b/common/framework/formatter.php
index 4098f4bb1..dc3cf3313 100644
--- a/common/framework/formatter.php
+++ b/common/framework/formatter.php
@@ -98,22 +98,25 @@ class Formatter
 	 */
 	public static function markdown2html($markdown, $options = 0)
 	{
-		if ($options & self::MD_NEWLINE_AS_BR)
-		{
-			$markdown = preg_replace('/(?<!\n)\n(?![\n\*\#\-])/', "  \n", $markdown);
-		}
-		
 		if ($options & self::MD_ENABLE_EXTRA)
 		{
-			$class_name = '\\Michelf\\MarkdownExtra';
+			$classes = array('footnote-ref', 'footnote-backref');
+			$parser = new \Michelf\MarkdownExtra;
+			$parser->fn_id_prefix = 'user_content_';
 		}
 		else
 		{
-			$class_name = '\\Michelf\\Markdown';
+			$classes = false;
+			$parser = new \Michelf\Markdown;
 		}
 		
-		$html = $class_name::defaultTransform($markdown);
-		return Filters\HTMLFilter::clean($html);
+		if ($options & self::MD_NEWLINE_AS_BR)
+		{
+			$parser->hard_wrap = true;
+		}
+		
+		$html = $parser->transform($markdown);
+		return Filters\HTMLFilter::clean($html, $classes);
 	}
 	
 	/**
diff --git a/tests/_data/formatter/html2markdown.target.md b/tests/_data/formatter/html2markdown.target.md
index 77f8ba106..8f3b07c3a 100644
--- a/tests/_data/formatter/html2markdown.target.md
+++ b/tests/_data/formatter/html2markdown.target.md
@@ -1,7 +1,7 @@
 This is a Markdown document. These lines belong in the same paragraph. Markdown usually ignores single line breaks.
 
 This is a [link](foobar.html "title").  
- This is an ![alt](foobar.jpg "image").
+This is an ![alt](foobar.jpg "image").
 
 - This is a list.
 - It has two items.
diff --git a/tests/_data/formatter/markdown2html.target2.html b/tests/_data/formatter/markdown2html.target2.html
index eadda1be2..81f890633 100644
--- a/tests/_data/formatter/markdown2html.target2.html
+++ b/tests/_data/formatter/markdown2html.target2.html
@@ -2,16 +2,16 @@
 These lines belong in the same paragraph.<br />
 Markdown usually ignores single line breaks.</p>
 
-<pre><code>This is an indented code segment.  
+<pre><code>This is an indented code segment.
 All Markdown variants will recognize it.
 </code></pre>
 
-<p><code>This is a fenced code segment.  
+<p><code>This is a fenced code segment.
 Only Markdown Extra will recognize it.</code></p>
 
 <p>This is a <a href="foobar.html">link</a>.<br />
 This is an <img src="foobar.jpg" alt="image" />.</p>
 
-<ul><li>This is a list.  </li>
-<li>It has two items.  </li>
+<ul><li>This is a list.</li>
+<li>It has two items.</li>
 </ul>
\ No newline at end of file
diff --git a/tests/_data/formatter/markdown2html.target3.html b/tests/_data/formatter/markdown2html.target3.html
index 70d90810d..9432af43f 100644
--- a/tests/_data/formatter/markdown2html.target3.html
+++ b/tests/_data/formatter/markdown2html.target3.html
@@ -2,17 +2,17 @@
 These lines belong in the same paragraph.<br />
 Markdown usually ignores single line breaks.</p>
 
-<pre><code>This is an indented code segment.  
+<pre><code>This is an indented code segment.
 All Markdown variants will recognize it.
 </code></pre>
 
-<pre><code>This is a fenced code segment.  
-Only Markdown Extra will recognize it.  
+<pre><code>This is a fenced code segment.
+Only Markdown Extra will recognize it.
 </code></pre>
 
 <p>This is a <a href="foobar.html">link</a>.<br />
 This is an <img src="foobar.jpg" alt="image" />.</p>
 
-<ul><li>This is a list.  </li>
-<li>It has two items.  </li>
+<ul><li>This is a list.</li>
+<li>It has two items.</li>
 </ul>
\ No newline at end of file
diff --git a/tests/_data/formatter/markdown2html.target4.html b/tests/_data/formatter/markdown2html.target4.html
new file mode 100644
index 000000000..7d430da66
--- /dev/null
+++ b/tests/_data/formatter/markdown2html.target4.html
@@ -0,0 +1,18 @@
+<p>This is a Markdown document.
+These lines belong in the same paragraph.
+Markdown usually ignores single line breaks.</p>
+
+<pre><code>This is an indented code segment.
+All Markdown variants will recognize it.
+</code></pre>
+
+<pre><code>This is a fenced code segment.
+Only Markdown Extra will recognize it.
+</code></pre>
+
+<p>This is a <a href="foobar.html">link</a>.
+This is an <img src="foobar.jpg" alt="image" />.</p>
+
+<ul><li>This is a list.</li>
+<li>It has two items.</li>
+</ul>
\ No newline at end of file
diff --git a/tests/_data/formatter/markdownextra.source.md b/tests/_data/formatter/markdownextra.source.md
new file mode 100644
index 000000000..4587c270d
--- /dev/null
+++ b/tests/_data/formatter/markdownextra.source.md
@@ -0,0 +1,16 @@
+<div markdown="1">
+	This is *true* markdown text.
+</div>
+
+This sentence has a footnote. [^1]
+
+[^1]: Here's the footnote content.
+
+```
+fenced code block
+```
+
+Hello | World
+----- | ------
+Foo   | Bar
+Baz   | Rhymix
diff --git a/tests/_data/formatter/markdownextra.target1.html b/tests/_data/formatter/markdownextra.target1.html
new file mode 100644
index 000000000..6563610b3
--- /dev/null
+++ b/tests/_data/formatter/markdownextra.target1.html
@@ -0,0 +1,14 @@
+<div>
+    This is *true* markdown text.
+</div>
+
+<p>This sentence has a footnote. [^1]</p>
+
+<p>[^1]: Here's the footnote content.</p>
+
+<p><code>fenced code block</code></p>
+
+<p>Hello | World
+----- | ------
+Foo   | Bar
+Baz   | Rhymix</p>
diff --git a/tests/_data/formatter/markdownextra.target2.html b/tests/_data/formatter/markdownextra.target2.html
new file mode 100644
index 000000000..916441aaa
--- /dev/null
+++ b/tests/_data/formatter/markdownextra.target2.html
@@ -0,0 +1,24 @@
+<div>
+
+<pre><code>This is *true* markdown text.
+</code></pre>
+
+</div>
+
+<p>This sentence has a footnote. <sup id="user_content_fnref:user_content_1"><a href="#fn:user_content_1" class="footnote-ref">1</a></sup></p>
+
+<pre><code>fenced code block
+</code></pre>
+
+<table><thead><tr><th>Hello</th>
+  <th>World</th>
+</tr></thead><tbody><tr><td>Foo</td>
+  <td>Bar</td>
+</tr><tr><td>Baz</td>
+  <td>Rhymix</td>
+</tr></tbody></table><div>
+<hr /><ol><li id="user_content_fn:user_content_1">
+<p>Here's the footnote content. <a href="#fnref:user_content_1" class="footnote-backref">↩︎</a></p>
+</li>
+
+</ol></div>
diff --git a/tests/unit/framework/FormatterTest.php b/tests/unit/framework/FormatterTest.php
index 1f8e26c37..7688cd7df 100644
--- a/tests/unit/framework/FormatterTest.php
+++ b/tests/unit/framework/FormatterTest.php
@@ -28,10 +28,22 @@ class FormatterTest extends \Codeception\TestCase\Test
 		$html1 = file_get_contents(\RX_BASEDIR . 'tests/_data/formatter/markdown2html.target1.html');
 		$html2 = file_get_contents(\RX_BASEDIR . 'tests/_data/formatter/markdown2html.target2.html');
 		$html3 = file_get_contents(\RX_BASEDIR . 'tests/_data/formatter/markdown2html.target3.html');
+		$html4 = file_get_contents(\RX_BASEDIR . 'tests/_data/formatter/markdown2html.target4.html');
 		
 		$this->assertEquals($html1, Rhymix\Framework\Formatter::markdown2html($markdown));
 		$this->assertEquals($html2, Rhymix\Framework\Formatter::markdown2html($markdown, Rhymix\Framework\Formatter::MD_NEWLINE_AS_BR));
 		$this->assertEquals($html3, Rhymix\Framework\Formatter::markdown2html($markdown, Rhymix\Framework\Formatter::MD_NEWLINE_AS_BR | Rhymix\Framework\Formatter::MD_ENABLE_EXTRA));
+		$this->assertEquals($html4, Rhymix\Framework\Formatter::markdown2html($markdown, Rhymix\Framework\Formatter::MD_ENABLE_EXTRA));
+	}
+	
+	public function testMarkdownExtra()
+	{
+		$markdown = file_get_contents(\RX_BASEDIR . 'tests/_data/formatter/markdownextra.source.md');
+		$html1 = file_get_contents(\RX_BASEDIR . 'tests/_data/formatter/markdownextra.target1.html');
+		$html2 = file_get_contents(\RX_BASEDIR . 'tests/_data/formatter/markdownextra.target2.html');
+		
+		$this->assertEquals($html1, Rhymix\Framework\Formatter::markdown2html($markdown));
+		$this->assertEquals($html2, Rhymix\Framework\Formatter::markdown2html($markdown, Rhymix\Framework\Formatter::MD_ENABLE_EXTRA));
 	}
 	
 	public function testHTML2Markdown()