diff --git a/monstra/Page.php b/monstra/Page.php
index 8771c71..d1bdb26 100755
--- a/monstra/Page.php
+++ b/monstra/Page.php
@@ -56,10 +56,10 @@ class Page
             }
 
             if (is_array($page_content)) {
-                $page['summary'] = $page['summary'];
-                $page['content'] = $page['content'];
+                $page['summary'] = $this->monstra['markdown']->text($page['summary']);
+                $page['content'] = $this->monstra['markdown']->text($page['content']);
             } else {
-                $page['content'] = $page_content;
+                $page['content'] = $this->monstra['markdown']->text($page_content);
             }
         }
 
diff --git a/site/config/site.yml b/site/config/site.yml
index c27a42c..9af49ee 100755
--- a/site/config/site.yml
+++ b/site/config/site.yml
@@ -14,7 +14,6 @@ charset: UTF-8
 theme: default
 
 plugins:
-  - Markdown
 
 pages:
   flush_cache: false
diff --git a/site/plugins/Markdown/Markdown.php b/site/plugins/Markdown/Markdown.php
deleted file mode 100755
index a323fcc..0000000
--- a/site/plugins/Markdown/Markdown.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-namespace Monstra;
-
-class Markdown extends Plugin
-{
-
-    /**
-     * @var Monstra
-     */
-    protected $monstra;
-
-    /**
-     * Construct
-     */
-    public function __construct(Monstra $c)
-    {
-        $this->monstra = $c;
-        $this->monstra['filters']->addListener('content', function($content) {
-            return $this->monstra['markdown']->text($content);
-        });
-    }
-}
-
-new Markdown($monstra);
diff --git a/site/plugins/Markdown/Markdown.yml b/site/plugins/Markdown/Markdown.yml
deleted file mode 100755
index c548e5f..0000000
--- a/site/plugins/Markdown/Markdown.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Markdown
-version: 1.0.0
-description: "Markdown parser plugin for Monstra"
-author:
-  name: Sergey Romanenko
-  email: awilum@msn.com
-  url: http://monstra.org
-homepage: http://monstra.org
-bugs: http://monstra.org
-license: MIT
-
-# Plugin settings
-enabled: true