diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30028a3..22ae187 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,21 @@
+# v1.1.1
+## 12/11/2015
+
+1. [](#improved)
+    * Drop the autofocus on the comment form
+1. [](#bugfix)
+    * Fix double encoding (#12)    
+
 # v1.1.0
 ## 11/24/2015
 
-1. [](#improved)
-    Use date instead of gmdate to respect the server local time (thanks @bovisp)
-1. [](#improved)
-    Now works with multilang (thanks @bovisp)
 1. [](#new)
-    Added french (@codebee-fr) and russian (@joomline) languages
-1. [](#new)
-    Takes advantage of the new nonce support provided by the Form plugin
+    * Added french (@codebee-fr) and russian (@joomline) languages
+    * Takes advantage of the new nonce support provided by the Form plugin
+1. [](#improved)
+    * Use date instead of gmdate to respect the server local time (thanks @bovisp)
+    * Now works with multilang (thanks @bovisp)
+   
 
 # v1.0.2
 ## 11/13/2015
@@ -21,10 +28,11 @@
 # v1.0.1
 ## 11/11/2015
 
-1. [](#bugfix)
-    * Fix error when user/data/comments does not exist
 1. [](#improved)
     * Use onAdminMenu instead of the deprecated onAdminTemplateNavPluginHook
+1. [](#bugfix)
+    * Fix error when user/data/comments does not exist
+
 
 # v1.0.0
 ## 10/21/2015
diff --git a/blueprints.yaml b/blueprints.yaml
index 23c8197..7416773 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Comments
-version: 1.1.0
+version: 1.1.1
 description: Adds a commenting functionality to your site
 icon: comment
 author:
diff --git a/comments.yaml b/comments.yaml
index 6211da3..ea24031 100644
--- a/comments.yaml
+++ b/comments.yaml
@@ -14,7 +14,6 @@ form:
         - name: name
           label: Name
           placeholder: Enter your name
-          autofocus: on
           autocomplete: on
           type: text
           validate:
diff --git a/templates/partials/comments.html.twig b/templates/partials/comments.html.twig
index 7a798e1..691dd86 100644
--- a/templates/partials/comments.html.twig
+++ b/templates/partials/comments.html.twig
@@ -35,9 +35,9 @@
             {% for comment in grav.twig.comments|array_reverse %}
             <tr>
                 <td>
-                    {{comment.text|e}}
+                    {{comment.text}}
                     <br />
-                    {{'PLUGIN_COMMENTS.WRITTEN_ON'|t}} {{comment.date|e}} {{'PLUGIN_COMMENTS.BY'|t}} {{comment.author|e}}
+                    {{'PLUGIN_COMMENTS.WRITTEN_ON'|t}} {{comment.date|e}} {{'PLUGIN_COMMENTS.BY'|t}} {{comment.author}}
                 </td>
             </tr>
             {% endfor %}