diff --git a/ChangeLog b/ChangeLog
index f03a957..cb2c972 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-v0.2 (04/01/2014)
+v0.2 (16/03/2014)
 
 ** User **
         Add dyn:post_url and dyn:post_full_url for replace directive (doesn't prepend http://)
@@ -6,12 +6,14 @@ v0.2 (04/01/2014)
 	Add Mardown support
 	Add all posts generators
 	Set default font size to 14 for TinyMCE
+	Allow to reference comments with #comment_number
 
 ** Dev **
 	Add coding information in all py files
 	Add HTML5 markup for blog.soutade.fr
 	Add ChangeLog
 	Simplify archive generation code
+	Trim comment before saving
 
 ** Bugs **
 	Escape double quotes in metas tag
diff --git a/README b/README
index e5a79ea..5efef77 100644
--- a/README
+++ b/README
@@ -7,7 +7,8 @@ Django >= 1.4, libapache2-mod-wsgi if you want to use Dynastie with Apache. PyGm
 
 Installation :
 * Download Dynastie
-* Update wsgy.py (with $PWD/../) don't forget the final slash !
+* Update dynastie/wsgy.py (with $PWD/../) don't forget the final slash !
+* Update dynastie/settings.py (SECRET_KEY...)
 * Run ./manage.sh syncdb and create a superuser
 * Run ./manage.sh runserver 
 or
diff --git a/dynastie/sites/blog.soutade.fr/_all_posts.html b/dynastie/sites/blog.soutade.fr/_all_posts.html
old mode 100755
new mode 100644
diff --git a/dynastie/sites/blog.soutade.fr/_archive.html b/dynastie/sites/blog.soutade.fr/_archive.html
index 4d9b575..7eb50f7 100755
--- a/dynastie/sites/blog.soutade.fr/_archive.html
+++ b/dynastie/sites/blog.soutade.fr/_archive.html
@@ -6,7 +6,7 @@
 	<div class="post_header">
 	  <dyn:title link="1"/>
 	  <div class="post_sub_header">
-	    <dyn:date/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
+	    <dyn:date format="%A, %d %B %Y"/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
 	  </div>
 	  <dyn:tags link="1"/>
 	</div>
diff --git a/dynastie/sites/blog.soutade.fr/_base_post.html b/dynastie/sites/blog.soutade.fr/_base_post.html
old mode 100755
new mode 100644
diff --git a/dynastie/sites/blog.soutade.fr/_category.html b/dynastie/sites/blog.soutade.fr/_category.html
index 400cabf..40ef997 100755
--- a/dynastie/sites/blog.soutade.fr/_category.html
+++ b/dynastie/sites/blog.soutade.fr/_category.html
@@ -6,7 +6,7 @@
 	<div class="post_header">
 	  <dyn:title link="1"/>
 	  <div class="post_sub_header">
-	    <dyn:date/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
+	    <dyn:date format="%A, %d %B %Y"/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
 	  </div>
 	  <dyn:tags link="1"/>
 	</div>
diff --git a/dynastie/sites/blog.soutade.fr/_index.html b/dynastie/sites/blog.soutade.fr/_index.html
index 4615737..3ff5c1a 100755
--- a/dynastie/sites/blog.soutade.fr/_index.html
+++ b/dynastie/sites/blog.soutade.fr/_index.html
@@ -5,7 +5,7 @@
 	<div class="post_header">
 	  <dyn:title link="1"/>
 	  <div class="post_sub_header">
-	    <dyn:date/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
+	    <dyn:date format="%A, %d %B %Y"/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
 	  </div>
 	  <dyn:tags link="1"/>
 	</div>
diff --git a/dynastie/sites/blog.soutade.fr/_post.html b/dynastie/sites/blog.soutade.fr/_post.html
index 517821b..1c89413 100755
--- a/dynastie/sites/blog.soutade.fr/_post.html
+++ b/dynastie/sites/blog.soutade.fr/_post.html
@@ -6,7 +6,7 @@
 	  <div class="post_header">
 	    <dyn:title link="0"/>
 	    <div class="post_sub_header">
-	      <dyn:date/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
+	      <dyn:date format="%A, %d %B %Y"/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
 	    </div>
 	    <dyn:tags link="1"/>
 	  </div>
diff --git a/dynastie/sites/blog.soutade.fr/_search.html b/dynastie/sites/blog.soutade.fr/_search.html
index 294582a..414d072 100755
--- a/dynastie/sites/blog.soutade.fr/_search.html
+++ b/dynastie/sites/blog.soutade.fr/_search.html
@@ -5,7 +5,7 @@
 	<div class="post_header">
 	  <dyn:title link="1"/>
 	  <div class="post_sub_header">
-	    <dyn:date/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
+	    <dyn:date format="%A, %d %B %Y"/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
 	  </div>
 	  <dyn:tags link="1"/>
 	</div>
diff --git a/dynastie/sites/blog.soutade.fr/_tag.html b/dynastie/sites/blog.soutade.fr/_tag.html
old mode 100755
new mode 100644
index 0c2b80f..64e6766
--- a/dynastie/sites/blog.soutade.fr/_tag.html
+++ b/dynastie/sites/blog.soutade.fr/_tag.html
@@ -6,7 +6,7 @@
 	<div class="post_header">
 	  <dyn:title link="1"/>
 	  <div class="post_sub_header">
-	    <dyn:date/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
+	    <dyn:date format="%A, %d %B %Y"/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
 	  </div>
 	  <dyn:tags link="1"/>
 	</div>
diff --git a/dynastie/sites/blog.soutade.fr/css/blog.css b/dynastie/sites/blog.soutade.fr/css/blog.css
index 61f3b04..8b187c2 100755
--- a/dynastie/sites/blog.soutade.fr/css/blog.css
+++ b/dynastie/sites/blog.soutade.fr/css/blog.css
@@ -406,7 +406,6 @@ ul li
 .comment_author, .comment_date
 {
     margin-left:5px;
-    margin-right:5px;
 }
 
 .comment_author
diff --git a/dynastie/sites/blog.soutade.fr/js/blog.js b/dynastie/sites/blog.soutade.fr/js/blog.js
old mode 100755
new mode 100644
diff --git a/dynastie/templates/login.html b/dynastie/templates/login.html
index 4113e19..c51043f 100755
--- a/dynastie/templates/login.html
+++ b/dynastie/templates/login.html
@@ -22,7 +22,7 @@
   </head>
   <body>
     <div class="logo">
-      <a href="http://indefero.soutade.fr/p/dynastie>"><img src="{{ STATIC_URL }}images/logo.png"/></a>
+      <a href="http://indefero.soutade.fr/p/dynastie"><img src="{{ STATIC_URL }}images/logo.png"/></a>
     </div>
     <div class="form">
       <form method="post" action="/index">
diff --git a/dynastie/views.py b/dynastie/views.py
index a507738..c7d4f5f 100755
--- a/dynastie/views.py
+++ b/dynastie/views.py
@@ -18,6 +18,7 @@
   along with Dynastie.  If not, see <http://www.gnu.org/licenses/>.
 """
 import os
+import re
 from datetime import datetime, date, time
 from django.shortcuts import render
 from django.contrib.auth import authenticate, login, logout
@@ -710,10 +711,11 @@ def add_comment(request, post_id, parent_id):
         ip = request.META['REMOTE_ADDR']
 
     # Avoid script injection
-    the_comment = request.POST['the_comment']
+    the_comment = request.POST['the_comment'].strip()
     the_comment = the_comment.replace('<', '&lt;')
     the_comment = the_comment.replace('>', '&gt;')
     the_comment = the_comment.replace('\n', '<br />')
+    the_comment = re.sub('#([0-9]+)', '<a href=\"#comment_\\1\">#\\1</a>', the_comment)
 
     if 'mel' in request.POST:
         mel = request.POST['mel'].strip()