diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bf3057..d679bff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
-#Changelog
+# Changelog
+
+## [0.2.0]: 2019-11-12
+- Implement notes tagging support and filter with it.
+- Fix calling exponentially to save notes when pressed Alt+Return.
+- Update spanish translation
 
 ## [0.1.10]: 2019-11-02
 ### Added
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 1870be7..75832c0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
     <name>Quick notes</name>
     <summary>Quick notes with a basic rich text</summary>
     <description>Quick notes with a basic rich text</description>
-    <version>0.1.11</version>
+    <version>0.2.0</version>
     <licence>agpl</licence>
     <author>Matias De lellis</author>
     <namespace>QuickNotes</namespace>
@@ -17,7 +17,8 @@
     <screenshot small-thumbnail="https://raw.githubusercontent.com/matiasdelellis/quicknotes/master/doc/quicknotes-grid-view-small.png">https://raw.githubusercontent.com/matiasdelellis/quicknotes/master/doc/quicknotes-grid-view.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/matiasdelellis/quicknotes/master/doc/quicknotes-note-edit.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/matiasdelellis/quicknotes/master/doc/quicknotes-rich-text.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/matiasdelellis/quicknotes/master/doc/quicknotes-note-tag.png</screenshot>
     <dependencies>
-        <nextcloud min-version="14" max-version="17"/>
+        <nextcloud min-version="16" max-version="17"/>
     </dependencies>
 </info>
diff --git a/doc/quicknotes-grid-view-small.png b/doc/quicknotes-grid-view-small.png
index 380e76b..f24dd89 100644
Binary files a/doc/quicknotes-grid-view-small.png and b/doc/quicknotes-grid-view-small.png differ
diff --git a/doc/quicknotes-grid-view.png b/doc/quicknotes-grid-view.png
index e3b28d5..ec4276a 100644
Binary files a/doc/quicknotes-grid-view.png and b/doc/quicknotes-grid-view.png differ
diff --git a/doc/quicknotes-note-edit.png b/doc/quicknotes-note-edit.png
index 7209896..51344bb 100644
Binary files a/doc/quicknotes-note-edit.png and b/doc/quicknotes-note-edit.png differ
diff --git a/doc/quicknotes-note-tag.png b/doc/quicknotes-note-tag.png
new file mode 100644
index 0000000..3bd1f67
Binary files /dev/null and b/doc/quicknotes-note-tag.png differ
diff --git a/doc/quicknotes-rich-text.png b/doc/quicknotes-rich-text.png
index 57a2d32..9526546 100644
Binary files a/doc/quicknotes-rich-text.png and b/doc/quicknotes-rich-text.png differ
diff --git a/js/qn-dialogs.js b/js/qn-dialogs.js
index f7da11b..c1a26c3 100644
--- a/js/qn-dialogs.js
+++ b/js/qn-dialogs.js
@@ -30,7 +30,7 @@ const QnDialogs = {
 			var dialogId = '#' + dialogName;
 			var $dlg = $tmpl.octemplate({
 				dialog_name: dialogName,
-				title: t('quicknotes', 'Tag note'),
+				title: t('quicknotes', 'Tag the note'),
 				message: t('quicknotes', 'Enter tags to organize your note'),
 				type: 'none'
 			});
diff --git a/l10n/es.js b/l10n/es.js
index e50fba4..bb067e6 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -12,6 +12,11 @@ OC.L10N.register(
     "All notes" : "Todas las notas",
     "Colors" : "Colores",
     "Notes" : "Notas",
-    "Quick notes with a basic rich text" : "Notas rápidas con un texto enriquecido básico"
+    "Quick notes with a basic rich text" : "Notas rápidas con un texto enriquecido básico",
+    "Tag the note" : "Etiqueta la nota",
+    "Enter tags to organize your note" : "Ingrese etiquetas para organizar su nota",
+    "Enter tag name" : "Ingrese el nombre de la etiqueta",
+    "Done" : "Hecho",
+    "Tags" : "Etiquetas"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index 8548888..296e691 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -10,6 +10,11 @@
     "All notes" : "Todas las notas",
     "Colors" : "Colores",
     "Notes" : "Notas",
-    "Quick notes with a basic rich text" : "Notas rápidas con un texto enriquecido básico"
+    "Quick notes with a basic rich text" : "Notas rápidas con un texto enriquecido básico",
+    "Tag the note" : "Etiqueta la nota",
+    "Enter tags to organize your note" : "Ingrese etiquetas para organizar su nota",
+    "Enter tag name" : "Ingrese el nombre de la etiqueta",
+    "Done" : "Hecho",
+    "Tags" : "Etiquetas"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file