diff --git a/HISTORY.md b/HISTORY.md
index 24ea4c2..9c20b81 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,12 @@
https://github.com/josdejong/jsoneditor
+## not yet released, version 4.0.0
+
+- Ace editor and jsonlint are now packed with jsoneditor.js by default.
+- Reworked the source code to CommonJS modules, using `brace` to load Ace.
+
+
## 2015-01-25, version 3.2.0
- Implemented shortcut keys `Ctrl+\` to format and `Ctrl+Shift+\` to compact
diff --git a/README.md b/README.md
index e6eca24..be84366 100644
--- a/README.md
+++ b/README.md
@@ -74,12 +74,12 @@ download:
-
+
-
-```
-
-### Detailed error messages
-
-Optionally, [jsonlint](https://github.com/zaach/jsonlint) can be loaded to get
-more detailed error messages.
-
-```html
-
-```
-
-### Code editor
-
-The mode 'code' requires the [Ace editor](http://ace.ajax.org/) to be loaded.
-JSON Editor comes with a custom built version of Ace containing the ace modules
-`ace.js`, `ext-searchbox.js`, `mode-json.js`, `theme-textmate.js`, and a custom
-theme `theme-jsoneditor.js`.
-Besides loading ace, the content type must be specified on the page.
-
-```html
-
-
-
+
```
## Use
@@ -96,7 +73,7 @@ var json = editor.get();
-
+
@@ -105,7 +82,7 @@ var json = editor.get();
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Switch editor mode using the mode box.
- Note that the mode can be changed programmatically as well using the method
- editor.setMode(mode), try it in the console of your browser.
-