diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 15d6ab39..21d86cfc 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -8,12 +8,17 @@
 			"dependsOn": [
 				"npm: watch:client", "npm: watch:server"
 			],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
 			"problemMatcher": []
 		},
 		{
 			"type": "npm",
 			"script": "watch:client",
 			"isBackground": true,
+			"group": "build",
 			"presentation": {
 				"reveal": "never",
 				"panel": "dedicated"
@@ -26,6 +31,7 @@
 			"type": "npm",
 			"script": "watch:server",
 			"isBackground": true,
+			"group": "build",
 			"presentation": {
 				"reveal": "never",
 				"panel": "dedicated"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d43a2f0..0211d1e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Add support for multi workspace folder setups. Adding this supoort required a major code change both on the extension and the server side. So if you recognized problems with this version please report them as quick as possbible in the [GitHub repository](https://github.com/Microsoft/vscode-eslint).
 
+  Version 1.3.0 of the ESLint extension requires at least version 1.16 of VS Code.
+
 ### 1.2.11
 
 Fixes:
diff --git a/client/package.json b/client/package.json
index 34ce1bbb..7a36767c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -2,7 +2,7 @@
 	"name": "client",
 	"displayName": "ESLint",
 	"description": "Integrates ESLint into VS Code.",
-	"version": "1.0.0",
+	"version": "1.3.0",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
 	"repository": {
@@ -23,6 +23,6 @@
 		"vscode": "^1.1.5"
 	},
 	"dependencies": {
-		"vscode-languageclient": "^3.4.0-next.30"
+		"vscode-languageclient": "^3.4.0"
 	}
 }
\ No newline at end of file
diff --git a/contributing.md b/contributing.md
index a7dd3f5a..7e58b48f 100644
--- a/contributing.md
+++ b/contributing.md
@@ -5,14 +5,8 @@
 Extension to integrate [ESLint](http://eslint.org/) into VSCode.
 
 ## Development setup
-- run npm install inside the `eslint` and `eslint-server` folders
-- open VS Code on `eslint` and `eslint-server`
-
-## Developing the server
-- open VS Code on `eslint-server`
-- run `npm run compile` or `npm run watch` to build the server and copy it into the `eslint` folder
-- to debug press F5 which attaches a debugger to the server
-
-## Developing the extension/client
-- open VS Code on `eslint`
-- run F5 to build and debug the extension
\ No newline at end of file
+- run npm install
+- open VS Code
+- Run the `watch` task to compile the client and server
+- To run/debug the extension use the `Launch Extension` launch configuration
+- to debug the server use the `Attach to Server` launch configuration
\ No newline at end of file
diff --git a/server/package.json b/server/package.json
index 5a82f156..96e121a5 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "eslint-server",
-	"version": "1.2.1",
+	"version": "1.3.0",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
 	"repository": {
@@ -15,7 +15,7 @@
 	},
 	"dependencies": {
 		"vscode-uri": "^1.0.1",
-		"vscode-languageserver": "^3.4.0-next.9"
+		"vscode-languageserver": "^3.4.0"
 	},
 	"scripts": {
 		"compile": "installServerIntoExtension ../eslint ./package.json ./src/tsconfig.json && tsc -p ./src",