diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dda3731..90674820 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 0.24.0 (2020/6/12)
+* __Feature__: [AWS Signature version 4 authentication](https://github.com/Huachao/vscode-restclient/pull/586) ([@sebastian-fredriksson-bernholtz](https://github.com/sebastian-fredriksson-bernholtz))
+* __Feature__: [Present an Option to Confirm Send](https://github.com/Huachao/vscode-restclient/pull/538) ([@ChayimFriedman2](https://github.com/ChayimFriedman2))
+* __Feature__: [Add support for the XDG directory specification](https://github.com/Huachao/vscode-restclient/pull/590) ([@tristan957](https://github.com/tristan957))
+* __Bug Fix__: [Fix request line parse error if url contains http](https://github.com/Huachao/vscode-restclient/issues/543)
+* __Bug Fix__: [$guid parameter reported as not found in editor](https://github.com/Huachao/vscode-restclient/issues/551)
+* __Bug Fix__: [Space in URL causes wrong colorization](https://github.com/Huachao/vscode-restclient/issues/584)
+* __Bug Fix__: [Suppress response body validation for empty JSON response](https://github.com/Huachao/vscode-restclient/issues/598)
+* __Bug Fix__: [Escape quotes for decodeEscapedUnicodeCharacters](https://github.com/Huachao/vscode-restclient/pull/602) ([@Treno1](https://github.com/Treno1))
+* __Bug Fix__: Fix Basic/Digest auth scheme not case-insensitive
+* __Bug Fix__: Fix incorrect header in saved response
+* __Improvement__: [Fix demo http request syntax in *README.md*](https://github.com/Huachao/vscode-restclient/pull/542) ([@Baoyx007](https://github.com/Baoyx007))
+* __Improvement__: [Refine *README.md* usage section](https://github.com/Huachao/vscode-restclient/pull/591) ([@matyasforian](https://github.com/matyasforian))
+* __Improvement__: Support query line syntax highlight
+* __Improvement__: Support more code snippet clients
+
+
 ## 0.23.2 (2020/3/9)
 * __Bug Fix__: [Redirect 303 use port of original request](https://github.com/Huachao/vscode-restclient/issues/502)
 * __Bug Fix__: [Cookie header not respected when `rest-client.rememberCookiesForSubsequentRequest` is set to `false`](https://github.com/Huachao/vscode-restclient/issues/507)
diff --git a/README.md b/README.md
index e114c8bc..81a481fd 100644
--- a/README.md
+++ b/README.md
@@ -564,7 +564,6 @@ For example: Define a shell environment variable in `.bashrc` or similar on wind
 
   `%`: Optional. If specified, treats envVarName as an extension setting environment variable, and uses the value of that for the lookup.
 
-
 * `{{$dotenv [%]variableName}}`: Returns the environment value stored in the [`.env`](https://github.com/motdotla/dotenv) file which exists in the same directory of your `.http` file.
 * `{{$randomInt min max}}`: Returns a random integer between min (included) and max (excluded)
 * `{{$timestamp [offset option]}}`: Add UTC timestamp of now. You can even specify any date time based on current time in the format `{{$timestamp number option}}`, e.g., to represent 3 hours ago, simply `{{$timestamp -3 h}}`; to represent the day after tomorrow, simply `{{$timestamp 2 d}}`.
@@ -574,17 +573,17 @@ For example: Define a shell environment variable in `.bashrc` or similar on wind
 The offset options you can specify in `timestamp` and `datetime` are:
 
 Option | Description
------- | -----------
-y | Year
-M | Month
-w | Week
-d | Day
-h | Hour
-m | Minute
-s | Second
-ms | Millisecond
-
-Below is a example using system variables:Da
+-------|------------
+y      | Year
+M      | Month
+w      | Week
+d      | Day
+h      | Hour
+m      | Minute
+s      | Second
+ms     | Millisecond
+
+Below is a example using system variables:
 ```http
 POST https://api.example.com/comments HTTP/1.1
 Content-Type: application/xml
@@ -607,11 +606,11 @@ REST Client Extension adds the ability to control the font family, size and weig
 
 By default, REST Client Extension only previews the full response in preview panel(_status line_, _headers_ and _body_). You can control which part should be previewed via the `rest-client.previewOption` setting:
 
-Option | Description
------- | -----------
-full | Default. Full response is previewed
-headers | Only the response headers(including _status line_) are previewed
-body | Only the response body is previewed
+Option   | Description
+---------|-----------------------------------------------------------------
+full     | Default. Full response is previewed
+headers  | Only the response headers(including _status line_) are previewed
+body     | Only the response body is previewed
 exchange | Preview the whole HTTP exchange(request and response)
 
 ## Settings
@@ -646,6 +645,15 @@ exchange | Preview the whole HTTP exchange(request and response)
 
 Rest Client extension respects the proxy settings made for Visual Studio Code (`http.proxy` and `http.proxyStrictSSL`). Only HTTP and HTTPS proxies are supported.
 
+### Per-request Settings
+REST Client Extension also supports request-level settings for each independent request. The syntax is similar with the request name definition, `# @settingName [settingValue]`, a required setting name as well as the optional setting vaule. Available settings are listed as following:
+
+Name | Syntax    | Description
+-----|-----------|--------------------------------------------------------------
+note | `# @note` | Use for request confirmation, especially for critical request
+
+> All the above leading `#` can be replaced with `//`
+
 ## License
 [MIT License](LICENSE)
 
diff --git a/package.json b/package.json
index eff97332..7b84eec2 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "rest-client",
   "displayName": "REST Client",
   "description": "REST Client for Visual Studio Code",
-  "version": "0.23.2",
+  "version": "0.24.0",
   "publisher": "humao",
   "author": {
     "name": "Huachao Mao",