diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 000000000..484b40150
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,10 @@
+tasks:
+  - init: yarn install
+    command: yarn run start
+ports:
+  - port: 3000
+    onOpen: open-preview
+
+vscode:
+  extensions:
+    - octref.vetur@0.23.0:0z6KpEz8h/vAvy4pYRDg3Q==
\ No newline at end of file
diff --git a/README.md b/README.md
index 477c46bd6..b3204ce8c 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 # tiptap
 A renderless and extendable rich-text editor for [Vue.js](https://github.com/vuejs/vue)
 
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ueberdosis/tiptap) 
 [![Version](https://img.shields.io/npm/v/tiptap.svg?label=version)](https://www.npmjs.com/package/tiptap)
 [![Downloads](https://img.shields.io/npm/dm/tiptap.svg)](https://npmcharts.com/compare/tiptap?minimal=true)
 [![License](https://img.shields.io/npm/l/tiptap.svg)](https://www.npmjs.com/package/tiptap)
@@ -10,7 +11,6 @@ A renderless and extendable rich-text editor for [Vue.js](https://github.com/vue
 [![Build Status](https://github.com/ueberdosis/tiptap/workflows/ci/badge.svg)](https://github.com/ueberdosis/tiptap/actions)
 [![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub)](https://github.com/sponsors/ueberdosis)
 
-
 ## Why I built tiptap
 I was looking for a text editor for [Vue.js](https://github.com/vuejs/vue) and found some solutions that didn't really satisfy me. The editor should be easy to extend and not based on old dependencies such as jQuery. For React there is already a great editor called [Slate.js](https://github.com/ianstormtaylor/slate), which impresses with its modularity. I came across [Prosemirror](https://github.com/prosemirror) and decided to build on it. Prosemirror is a toolkit for building rich-text editors that are already in use at many well-known companies such as *Atlassian* or *New York Times*.
 
@@ -491,6 +491,18 @@ yarn build:packages
 yarn build:examples
 ```
 
+## Contribute using the online one-click setup
+
+You can use Gitpod(a free online VS Code-like IDE) for contributing. With a single click, it will launch a workspace and automatically:
+
+- clone the `tiptap` repo.
+- install the dependencies.
+- run `yarn run start`.
+
+So that anyone interested in contributing can start straight away.
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ueberdosis/tiptap/)
+
 ## Contributing
 
 Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
diff --git a/packages/tiptap-extensions/src/extensions/History.js b/packages/tiptap-extensions/src/extensions/History.js
index 9700dd9c4..9f75be28c 100644
--- a/packages/tiptap-extensions/src/extensions/History.js
+++ b/packages/tiptap-extensions/src/extensions/History.js
@@ -21,6 +21,9 @@ export default class History extends Extension {
       'Mod-z': undo,
       'Mod-y': redo,
       'Shift-Mod-z': redo,
+      // Russian language
+      'Mod-я': undo,
+      'Shift-Mod-я': redo,
     }
 
     return keymap