diff --git a/src/helpers/Markdown.php b/src/helpers/Markdown.php
index 76f37e9..b063a56 100755
--- a/src/helpers/Markdown.php
+++ b/src/helpers/Markdown.php
@@ -20,6 +20,7 @@ class Markdown extends \Parsedown
      */
     public function text($markdown) {
         $markdown = $this->parseMentions($markdown);
+        $markdown = $this->parseIssueMentions($markdown);
         $this->setBreaksEnabled(true);
         $html = parent::text($markdown);
 
@@ -32,6 +33,12 @@ class Markdown extends \Parsedown
         return preg_replace($regex, "<a class='mention' href='https://github.com/$1'>$0</a>", $markdown);
     }
 
+    private function parseIssueMentions($markdown) {
+        $regex = '/#(\d+)/';
+        return preg_replace($regex, "<a href='/$1'>$0</a>", $markdown);
+    }
+
+
     /**
      * <a href="http://issues.piwik.org/attachments/1199/swelen_dateslider.swf">swelen_dateslider.swf</a>
      * to