diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61bf32cb..ec62deb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,20 +7,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
## [Unreleased]
### Added
+- jwt: new JSON Web Token (JWT) library (supports for claim exp, iat, nbf, iss, aud).
+
### Changed
-- http_network:
- Integrated changes on SOCKET so that EiffelWeb can be compiled with 16.05 to 17.05 and after.
### Deprecated
### Removed
### Fixed
-- http_client:
- Improved query and form data encoding (based on a very early version of the general URI percent-encoding rules).
- - now correct encoding of space by '%20' in path segment, and '+' in query parameters.
- Unify and fixed query parameters handling for libcurl and net implementation.
- Fixed file uploading (various issue in libcurl, and net implementation).
- Fixed form multipart encoding by using correctly the boundary.
-- Code cleaning:
- Removed many obsolete calls, and added timestamp on EiffelWeb obsolete features to benefit from upcoming improvement on the EiffelStudio Inspector tool.
+- Removed a few obsolete calls.
+- `http_client`: Added support for multiple file in form data. Made clear what is the meaning of `upload_filename`, `upload_data` and `form_data`.
### Security
diff --git a/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf b/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf
index 8022eb5e..289614d5 100644
--- a/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf
+++ b/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf
@@ -1,3 +1,3 @@
-
-
-
+
+
+
diff --git a/library/network/http_client/libcurl_http_client.ecf b/library/network/http_client/libcurl_http_client.ecf
index 11495cbe..8bb9e85c 100644
--- a/library/network/http_client/libcurl_http_client.ecf
+++ b/library/network/http_client/libcurl_http_client.ecf
@@ -16,6 +16,7 @@
+
diff --git a/library/network/http_client/net_http_client.ecf b/library/network/http_client/net_http_client.ecf
index d358471c..7f67cdf3 100644
--- a/library/network/http_client/net_http_client.ecf
+++ b/library/network/http_client/net_http_client.ecf
@@ -25,6 +25,7 @@
+