diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 53f189fbc..905845d13 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.13.2
+current_version = 1.14.0
 
 [bumpversion:file:src/libzxbc/version.py]
 search = VERSION = '{current_version}'
diff --git a/Changelog.md b/Changelog.md
index 818924e6d..0f8fccf69 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+[v1.14.0](https://github.com/boriel/zxbasic/tree/v1.14.0)
+===
++ Added token pasting ## and stringizing # operators to the
+  preprocessor
++ Warnings and error messages improved with codes
++ Warnings can now be silenced with -Wxxx (i.e. -W150)
++ Improved error reporting (files and line numbers)  
++ Improved code generation and optimization
++ Speed compilation increased by 100%!
++ ! Fixed many bugs and improved stability
+
 [v1.13.2](https://github.com/boriel/zxbasic/tree/v1.13.2)
 ===
 + ! Fix bug with optimizer
diff --git a/docs/archive.md b/docs/archive.md
index 8e28d120e..ccf4ae34c 100644
--- a/docs/archive.md
+++ b/docs/archive.md
@@ -10,27 +10,27 @@ repository (git).
 You can contribute to ZX BASIC by reporting possible bugs or improvement suggestions at the
 [forum](http://www.boriel.com/forum) or in social media.
 
-Latest stable version is <span style="color: green;">**1.13.2**</span>.
+Latest stable version is <span style="color: green;">**1.14.0**</span>.
 Click on the desired icon below to download the package suitable for your platform:
 
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/win32.png" alt="win32zip" width="32px"/>
-  http://www.boriel.com/files/zxb/zxbasic-1.13.2-win32.zip](http://www.boriel.com/files/zxb/zxbasic-1.13.2-win32.zip)
+  http://www.boriel.com/files/zxb/zxbasic-1.14.0-win32.zip](http://www.boriel.com/files/zxb/zxbasic-1.14.0-win32.zip)
 <br />Windows .exe zip package. No install needed, just uncompress it in a directory of your choice.
 <br/>&nbsp;
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/macos.png" alt="macostargz" width="32px"/>
-  http://www.boriel.com/files/zxb/zxbasic-1.13.2-macos.tar.gz](http://www.boriel.com/files/zxb/zxbasic-1.13.2-macos.tar.gz)
+  http://www.boriel.com/files/zxb/zxbasic-1.14.0-macos.tar.gz](http://www.boriel.com/files/zxb/zxbasic-1.14.0-macos.tar.gz)
 <br />Mac OS x64 binary package. No install needed, just uncompress it in a directory of your choice.
 <br/>&nbsp;
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/linux.png" alt="macostargz" width="32px"/>
-  http://www.boriel.com/files/zxb/zxbasic-1.13.2-linux64.tar.gz](http://www.boriel.com/files/zxb/zxbasic-1.13.2-linux64.tar.gz)
+  http://www.boriel.com/files/zxb/zxbasic-1.14.0-linux64.tar.gz](http://www.boriel.com/files/zxb/zxbasic-1.14.0-linux64.tar.gz)
 <br />Linux x64 binary package. No install needed, just uncompress it in a directory of your choice.
 <br/>&nbsp;
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/zip-package.png" alt="zip" width="32px"/>
-  http://www.boriel.com/files/zxb/zxbasic-1.13.2.zip](http://www.boriel.com/files/zxb/zxbasic-1.13.2.zip)
+  http://www.boriel.com/files/zxb/zxbasic-1.14.0.zip](http://www.boriel.com/files/zxb/zxbasic-1.14.0.zip)
 <br />Windows, Linux, Mac zip package, with python scripts. Requires python installed in your system.
 <br/>&nbsp;
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/driver-down.png" alt="tar.gz" width="32px"/>
-  http://www.boriel.com/files/zxb/zxbasic-1.13.2.tar.gz](http://www.boriel.com/files/zxb/zxbasic-1.13.2.tar.gz)
+  http://www.boriel.com/files/zxb/zxbasic-1.14.0.tar.gz](http://www.boriel.com/files/zxb/zxbasic-1.14.0.tar.gz)
 <br />Windows, Linux, Mac tar.gz package, with python scripts. Requires python installed in your system.
 
 ###What's new
diff --git a/pyproject.toml b/pyproject.toml
index d006b7bd1..cd55c6639 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zxbasic"
-version = "1.13.2"
+version = "1.14.0"
 description = "Boriel's ZX BASIC Compiler"
 authors = ["Jose Rodriguez <boriel@gmail.com>"]
 license = "GPL-3.0-or-later"
diff --git a/setup.py b/setup.py
index 25b88752b..84e93d9f3 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
 
 setup_kwargs = {
     'name': 'zxbasic',
-    'version': '1.13.2',
+    'version': '1.14.0',
     'description': "Boriel's ZX BASIC Compiler",
     'classifiers': [
         # How mature is this project? Common values are
diff --git a/src/libzxbc/version.py b/src/libzxbc/version.py
index e187b3397..aa2d19c6c 100755
--- a/src/libzxbc/version.py
+++ b/src/libzxbc/version.py
@@ -1 +1 @@
-VERSION = '1.13.2'
+VERSION = '1.14.0'