diff --git a/README.md b/README.md
index cc207358..917e29f6 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,13 @@
 
 REST Client allows you to send HTTP request and view the response in Visual Studio Code directly.
 
+## Features
+* Send __HTTP request__ in editor and view response in a separate pane with syntax highlight
+* Send __CURL command__ in editor
+* View request history
+* Code snippets for operations like `GET` and `POST`
+* Add HTTP language support, together with syntax highlight
+
 ## Usage
 In editor, type a HTTP request as simple as below:
 ```
@@ -72,6 +79,15 @@ We add the capability to directly run [curl request](https://curl.haxx.se/) in R
 ![request-history](images/request-history.png)
 Each time we sent a http request, the request details(method, url, headers and body) would be persisted into file. By using shortcut `Ctrl+Alt+H`, or press `F1` and then select/type `Rest Client: Request History`, you can view the last __50__ request items in the time reversing order, you can select any request you wish to trigger again. After specified request history item is selected, the request details would be displayed in a temp file, you can view the request details or follow previous step to trigger the request again.
 
+## HTTP Language
+Add language support for HTTP request, with this feature, you can have syntax highlight when writing HTTP request in Visual Studio Code. By default, the language association will be automatically activated in two cases:
+1. File with extension `.http` and `.rest`
+2. First line of file follows standard request line in [RFC 2616](http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html), with `Method SP Request-URI SP HTTP-Version` format
+
+If you want to enable language association in other cases, just change the language mode to `HTTP`.
+
+![HTTP Language](images/http.png)
+
 ## Settings
 * `rest-client.clearoutput`: Clear previous output for each request. (Default is __false__)
 * `rest-client.followredirect`: Follow HTTP 3xx responses as redirects. (Default is __true__)
@@ -82,6 +98,10 @@ Each time we sent a http request, the request details(method, url, headers and b
 [MIT License](LICENSE)
 
 ## Change Log
+### 0.5.0
+* Add HTTP language and syntax highlight
+* Add `.http` and `.rest` file extension associations with HTTP language
+
 ### 0.4.0
 * Add capability to directly run [curl request](https://curl.haxx.se/)
 
diff --git a/images/http.png b/images/http.png
new file mode 100644
index 00000000..20066970
Binary files /dev/null and b/images/http.png differ
diff --git a/package.json b/package.json
index 37c75f03..95ccecc8 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.4.0",
+  "version": "0.5.0",
   "publisher": "humao",
   "author": {
     "name": "Huachao Mao",