diff --git a/classes/Markdown.php b/classes/Markdown.php
index 4d0e9b4..9333c06 100644
--- a/classes/Markdown.php
+++ b/classes/Markdown.php
@@ -133,7 +133,7 @@ class Markdown
 		$string = preg_replace($pr, $rep, $string);
 
 		// Images
-		$pr = '(\[img[\|]#(\d+)\])';
+		$pr = '(\[img[\|]#(\d+)([\|](\w+))?\])';
 		$rep = ' ';
 		$string = preg_replace($pr, $rep, $string);
 
@@ -151,7 +151,7 @@ class Markdown
 
 		// Points
 		$pr = '((\[#(\d+)[>\|](.*?)\])|(\[#(\d+)\]))';
-		$rep = ' ';
+		$rep = '$3';
 		$string = preg_replace($pr, $rep, $string);
 
 		// multi-space