diff --git a/.vscode/settings.json b/.vscode/settings.json
index f77c3efa48..413796dffe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,6 +13,7 @@
   "files.trimTrailingWhitespace": true,
   "editor.tabSize": 2,
   "editor.insertSpaces": true,
+  "editor.formatOnSave": true,
   "files.insertFinalNewline": true,
   "editor.detectIndentation": false,
   "editor.wrappingIndent": "none",
diff --git a/README.md b/README.md
index da6149f788..bac071dc7e 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,10 @@ $ cd deeplearnjs
 $ npm run prep # Installs node modules and bower components.
 ```
 
+We recommend using [Visual Studio Code](https://code.visualstudio.com/) for
+development. Make sure to install the `clang-format` command line tool as
+well as the [Clang-Format VSCode extension](https://marketplace.visualstudio.com/items?itemName=xaver.clang-format) for auto-formatting.
+
 To interactively develop any of the demos (e.g. `demos/nn-art/`):
 
 ```bash