diff --git a/converter/markdown.js b/converter/markdown.js
index 7b21365..4b52839 100644
--- a/converter/markdown.js
+++ b/converter/markdown.js
@@ -8,10 +8,62 @@
    return str;
  }
 
+ var parseItalic = function(str) {
+  var italicRegExp = /(\*|_)(.*?)\1/;
+  var stra = [];
+  while ((stra = italicRegExp.exec(str)) !== null) {
+    str = str.replace(stra[0], '<i>' + stra[2] + '</i>')
+  }
+  return str;
+}
+
+var parseBold = function(str) {
+  var boldRegExp = /(\*\*)(.*?)\1/;
+  var stra = [];
+  while ((stra = boldRegExp.exec(str)) !== null) {
+    str = str.replace(stra[0], '<b>' + stra[2] + '</b>')
+  }
+  return str;
+ }
+
+var parseStrong = function(str) {
+  var strongRegExp = /(~~)(.*?)\1/;
+  var stra = [];
+  while ((stra = strongRegExp.exec(str)) !== null) {
+    str = str.replace(stra[0], '<strong>' + stra[2] + '</strong>')
+  }
+  return str;
+}
+
+
+ var parseHorizontaleLine = function(str) {
+  var horizontalRegExp = /^(?:([\*\-_] ?)+)\1\1$/gm;
+  var stra = [];
+  while ((stra = horizontalRegExp.exec(str)) !== null) {
+    str = str.replace(stra[0], '\n<hr/>\n');
+  }
+  return str;
+ }
+
+ var parseLink = function(str) {
+  var linkRegExp = /\[([^\[]+)\]\(([^\)]+)\)/;
+  var stra = [];
+  while ((stra = linkRegExp.exec(str)) !== null) {
+    str = str.replace(stra[0], '<a ' + 'href="' + stra[2] + '">' + stra[1] + '</a>');
+  }
+  return str;
+ }
+
+
 var markdown = {
   parse: function (str, strict) {
     'use strict';
     str = parseHeadline(str);
+    str = parseBold(str);
+    str = parseItalic(str);
+    str = parseStrong(str);
+    str = parseHorizontaleLine(str);
+    str = parseLink(str);
     return str;
   }
 };
diff --git a/converter/tests/features/bold.html b/converter/tests/features/bold.html
new file mode 100644
index 0000000..84e8209
--- /dev/null
+++ b/converter/tests/features/bold.html
@@ -0,0 +1 @@
+<b> en gras </b>
\ No newline at end of file
diff --git a/converter/tests/features/bold.md b/converter/tests/features/bold.md
new file mode 100644
index 0000000..7726932
--- /dev/null
+++ b/converter/tests/features/bold.md
@@ -0,0 +1 @@
+** en gras **
\ No newline at end of file
diff --git a/converter/tests/features/h1.html b/converter/tests/features/h1.html
index 1ef88d7..50a431d 100644
--- a/converter/tests/features/h1.html
+++ b/converter/tests/features/h1.html
@@ -1 +1 @@
-<h1> This is an H1</h1>
+<h1> This is an H1</h1>
\ No newline at end of file
diff --git a/converter/tests/features/h1.md b/converter/tests/features/h1.md
index 90944c9..f6a39e1 100644
--- a/converter/tests/features/h1.md
+++ b/converter/tests/features/h1.md
@@ -1 +1 @@
-# This is an H1
+# This is an H1
\ No newline at end of file
diff --git a/converter/tests/features/horizontal_line.html b/converter/tests/features/horizontal_line.html
new file mode 100644
index 0000000..e2c5e31
--- /dev/null
+++ b/converter/tests/features/horizontal_line.html
@@ -0,0 +1 @@
+<hr/>
\ No newline at end of file
diff --git a/converter/tests/features/horizontal_line.md b/converter/tests/features/horizontal_line.md
new file mode 100644
index 0000000..73b314f
--- /dev/null
+++ b/converter/tests/features/horizontal_line.md
@@ -0,0 +1 @@
+---
\ No newline at end of file
diff --git a/converter/tests/features/italic.html b/converter/tests/features/italic.html
new file mode 100644
index 0000000..807880b
--- /dev/null
+++ b/converter/tests/features/italic.html
@@ -0,0 +1 @@
+<i> italic </i>
\ No newline at end of file
diff --git a/converter/tests/features/italic.md b/converter/tests/features/italic.md
new file mode 100644
index 0000000..9a6e757
--- /dev/null
+++ b/converter/tests/features/italic.md
@@ -0,0 +1 @@
+_ italic _
\ No newline at end of file
diff --git a/converter/tests/features/link.html b/converter/tests/features/link.html
new file mode 100644
index 0000000..14c71d0
--- /dev/null
+++ b/converter/tests/features/link.html
@@ -0,0 +1 @@
+<a href="http://elephorm.com">Elephorm</a>
\ No newline at end of file
diff --git a/converter/tests/features/link.md b/converter/tests/features/link.md
new file mode 100644
index 0000000..92d79db
--- /dev/null
+++ b/converter/tests/features/link.md
@@ -0,0 +1 @@
+[Elephorm](http://elephorm.com)
\ No newline at end of file
diff --git a/converter/tests/features/strong.html b/converter/tests/features/strong.html
new file mode 100644
index 0000000..2ebfedd
--- /dev/null
+++ b/converter/tests/features/strong.html
@@ -0,0 +1 @@
+<strong> strong </strong>
\ No newline at end of file
diff --git a/converter/tests/features/strong.md b/converter/tests/features/strong.md
new file mode 100644
index 0000000..ff651bb
--- /dev/null
+++ b/converter/tests/features/strong.md
@@ -0,0 +1 @@
+~~ strong ~~
\ No newline at end of file