diff --git a/.travis.yml b/.travis.yml
index 905480ea..52312334 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ php:
   - 5.6
   - 7
   - 7.1
-  - hhvm
 
 before_script:
   - composer self-update
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c08baeb7..5c00b4c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,32 @@
 ## CHANGELOG
 
+### 1.0.0
+
+**Enhancements:**
+
+* [33: Create a command to generate a short code charset by randomizing the default one](https://github.com/acelaya/url-shortener/issues/33)
+* [15: Return JSON/HTML responses for errors (4xx and 5xx) based on accept header (content negotiation)](https://github.com/acelaya/url-shortener/issues/15)
+* [23: Translate application literals](https://github.com/acelaya/url-shortener/issues/23)
+* [21: Allow to filter visits by date range](https://github.com/acelaya/url-shortener/issues/21)
+* [22: Save visits locations data on a visit_locations table](https://github.com/acelaya/url-shortener/issues/22)
+* [20: Inject cross domain headers in response only if the Origin header is present in the request](https://github.com/acelaya/url-shortener/issues/20)
+* [11: Separate code into multiple modules](https://github.com/acelaya/url-shortener/issues/11)
+* [18: Group routable middleware in an Action namespace](https://github.com/acelaya/url-shortener/issues/18)
+
+**Tasks**
+
+* [36: Remove hhvm from the CI matrix since it doesn't support array constants and will fail](https://github.com/acelaya/url-shortener/issues/36)
+* [4: Installation steps](https://github.com/acelaya/url-shortener/issues/4)
+* [6: Remove dependency on expressive helpers package](https://github.com/acelaya/url-shortener/issues/6)
+* [30: Replace the "services" first level config entry by "dependencies", in order to fulfill default Expressive name](https://github.com/acelaya/url-shortener/issues/30)
+* [12: Improve code coverage](https://github.com/acelaya/url-shortener/issues/12)
+* [25: Replace "Middleware" suffix on routable middlewares by "Action"](https://github.com/acelaya/url-shortener/issues/25)
+* [19: Update the vendor and app namespace from Acelaya\UrlShortener to Shlinkio\Shlink](https://github.com/acelaya/url-shortener/issues/19)
+
+**Bugs**
+
+* [24: Prevent duplicated shortcodes errors because of the case insensitive behavior on MySQL](https://github.com/acelaya/url-shortener/issues/24)
+
 ### 0.2.0
 
 **Enhancements:**
diff --git a/module/CLI/lang/es.mo b/module/CLI/lang/es.mo
index 5d5830b3..b51c40cb 100644
Binary files a/module/CLI/lang/es.mo and b/module/CLI/lang/es.mo differ
diff --git a/module/CLI/lang/es.po b/module/CLI/lang/es.po
index b8fd2f7a..8bc5d32b 100644
--- a/module/CLI/lang/es.po
+++ b/module/CLI/lang/es.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Shlink 1.0\n"
-"POT-Creation-Date: 2016-07-21 15:54+0200\n"
-"PO-Revision-Date: 2016-07-21 15:56+0200\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2016-08-01 21:21+0200\n"
+"PO-Revision-Date: 2016-08-01 21:22+0200\n"
+"Last-Translator: Alejandro Celaya <alejandro@alejandrocelaya.com>\n"
 "Language-Team: \n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,19 @@ msgstr ""
 "X-Poedit-SearchPath-0: src\n"
 "X-Poedit-SearchPath-1: config\n"
 
-msgid "Generates a shortcode for provided URL and returns the short URL"
+#, php-format
+msgid ""
+"Generates a character set sample just by shuffling the default one, \"%s\". "
+"Then it can be set in the SHORTCODE_CHARS environment variable"
+msgstr ""
+"Genera un grupo de caracteres simplemente mexclando el grupo por defecto \"%s"
+"\". Después puede ser utilizado en la variable de entrono SHORTCODE_CHARS"
+
+msgid "Character set:"
+msgstr "Grupo de caracteres:"
+
+#, fuzzy
+msgid "Generates a short code for provided URL and returns the short URL"
 msgstr ""
 "Genera un código corto para la URL proporcionada y devuelve la URL acortada"