diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f87b777
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "parsedown"]
+	path = parsedown
+	url = https://github.com/erusev/parsedown.git
diff --git a/diary/Markdown is supported now.md b/diary/Markdown is supported now.md
new file mode 100644
index 0000000..5de82ea
--- /dev/null
+++ b/diary/Markdown is supported now.md	
@@ -0,0 +1,15 @@
+We are glad to announce that ...
+
+# Markdown Supported
+
+``` javascript
+for (var i = 0; i < 10; i++) {
+    document.write("Hello from Inndy (" + i + ")<br>");
+}
+```
+
+~~Line-through test~~ *Italic* **Bold** ***ItalicBold***
+
+---
+
+Markdown renderer takes from [parsedown](https://github.com/erusev/parsedown).
diff --git a/index.php b/index.php
index ed76d68..fbac168 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,5 @@
 <?php 
+include("parsedown/Parsedown.php");
 date_default_timezone_set('Asia/Taipei');
 
 /** The array which we'll store the diays later */
@@ -43,7 +44,7 @@ function Diary($SingleDiary)
 }
 
 
-
+$markdown_parser = new Parsedown();
 
 /**
  * Scan 
@@ -51,14 +52,31 @@ function Diary($SingleDiary)
  * Get all the diary files
  */
 
-foreach(glob(__DIR__ . '/diary/*.txt') as $Diary)
+foreach(glob(__DIR__ . '/diary/*') as $Diary)
 {
     /** The file name is the title of this diary */
-    /** Now we remove the path first, then we remove the file extension */
-    $Title = preg_replace('/\.\w*$/', '', preg_replace('/^.+[\\\\\\/]/', '', $Diary));
+    $info = pathinfo($Diary);
+    $extension = $info['extension'];
+
+    $Title = $info['filename'];
     
+    $Content = null;
+
     /** Get the content */
-    $Content = nl2br(file_get_contents($Diary));
+    switch ($extension) {
+        case 'md':
+        case 'markdown':
+            $Content = $markdown_parser->text(file_get_contents($Diary));
+            break;
+        case 'txt':
+        case 'text':
+            $Content = nl2br(file_get_contents($Diary));
+            break;
+    }
+
+    if ($Content === null) {
+        continue; // Skip invalid file type
+    }
     
     /** Get the unix timestramp of the file */
     $Date = filemtime($Diary);
diff --git a/parsedown b/parsedown
new file mode 160000
index 0000000..65116c3
--- /dev/null
+++ b/parsedown
@@ -0,0 +1 @@
+Subproject commit 65116c3cb0953447eac742aa4ea5fc4aaaa22db9