diff --git a/bower.json b/bower.json
index 6816e762..bf5d74e9 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ckeditor-codemirror-plugin",
   "homepage": "http://w8tcha.github.io/CKEditor-CodeMirror-Plugin/",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "authors": [
     "Ingo Herbote"
   ],
diff --git a/codemirror/dialogs/codemirrorAbout.js b/codemirror/dialogs/codemirrorAbout.js
index 96c4a9ba..ef9151ca 100644
--- a/codemirror/dialogs/codemirrorAbout.js
+++ b/codemirror/dialogs/codemirrorAbout.js
@@ -59,29 +59,48 @@ CKEDITOR.dialog.add('codemirrorAboutDialog',
                                 '<div class="cke_about_container">' +
                                 '<div class="cke_about_logo"></div>' +
                                 '<p>' +
-                                'CodeMirror ' +
-                                CodeMirror.version + ' (CKEditor Plugin Version ' + editor.plugins.codemirror.version + ')<br>' +
+                                (typeof (CodeMirror) == "undefined" ? "" : 'CodeMirror ' + CodeMirror.version) +
+                                ' (CKEditor Plugin Version ' +
+                                editor.plugins.codemirror.version +
+                                ')<br>' +
                                 '<a target="_blank" rel="noopener noreferrer" href="https://codemirror.net">https://codemirror.net</a> - ' +
                                 '<a target="_blank" rel="noopener noreferrer" href="https://github.com/w8tcha/CKEditor-CodeMirror-Plugin">https://github.com/w8tcha/CKEditor-CodeMirror-Plugin</a>' +
                                 '</p>' +
-                                '<h5>' + lang.moreInfoShortcuts + '</h5>' +
+                                '<h5>' +
+                                lang.moreInfoShortcuts +
+                                '</h5>' +
                                 '<p><ul>' +
-                                '<li>' + lang.moreInfoShortcuts1 + '</li>' +
-                                '<li>' + lang.moreInfoShortcuts2 + '</li>' +
-                                '<li>' + lang.moreInfoShortcuts3 + '</li>' +
-                                '<li>' + lang.moreInfoShortcuts4 + '</li>' +
-                                '<li>' + lang.moreInfoShortcuts5 + '</li>' +
-                                '<li>' + lang.moreInfoShortcuts6 + '</li>' +
-                                '<li>' + lang.moreInfoShortcuts7 + '</li>' +
-                                '<li>' + lang.moreInfoShortcuts8 + '</li>' +
-                                '<li>' + lang.moreInfoShortcuts9 + '</li>' +
-
+                                '<li>' +
+                                lang.moreInfoShortcuts1 +
+                                '</li>' +
+                                '<li>' +
+                                lang.moreInfoShortcuts2 +
+                                '</li>' +
+                                '<li>' +
+                                lang.moreInfoShortcuts3 +
+                                '</li>' +
+                                '<li>' +
+                                lang.moreInfoShortcuts4 +
+                                '</li>' +
+                                '<li>' +
+                                lang.moreInfoShortcuts5 +
+                                '</li>' +
+                                '<li>' +
+                                lang.moreInfoShortcuts6 +
+                                '</li>' +
+                                '<li>' +
+                                lang.moreInfoShortcuts7 +
+                                '</li>' +
+                                '<li>' +
+                                lang.moreInfoShortcuts8 +
+                                '</li>' +
+                                '<li>' +
+                                lang.moreInfoShortcuts9 +
+                                '</li>' +
                                 '</ul></p>' +
-
                                 '<p>' +
                                 lang.copyright +
                                 '</p>' +
-
                                 '</div>'
                         }
                     ]
diff --git a/codemirror/plugin.js b/codemirror/plugin.js
index 0ac97b50..ed7e8570 100644
--- a/codemirror/plugin.js
+++ b/codemirror/plugin.js
@@ -9,7 +9,7 @@
 (function() {
     CKEDITOR.plugins.add("codemirror", {
         lang: "af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en-au,en-ca,en-gb,en,eo,es,et,eu,fa,fi,fo,fr-ca,fr,gl,gu,he,hi,hr,hu,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt-br,pt,ro,ru,sk,sl,sr-latn,sr,sv,th,tr,ug,uk,vi,zh-cn,zh", // %REMOVE_LINE_CORE%
-        version: "1.18.1",
+        version: "1.18.2",
         init: function (editor) {
             var command = editor.addCommand("codemirrorAbout", new CKEDITOR.dialogCommand("codemirrorAboutDialog"));
             command.modes = { wysiwyg: 1, source: 1 };
@@ -1267,7 +1267,7 @@ CKEDITOR.plugins.sourcearea = {
             },
             editorFocus: false,
             readOnly: 1,
-            exec: function(editor) {
+            exec: function (editor) {
                 if (editor.mode === "wysiwyg") {
                     editor.fire("saveSnapshot");
                 }
@@ -1284,7 +1284,7 @@ CKEDITOR.plugins.sourcearea = {
             },
             editorFocus: false,
             readOnly: 1,
-            exec: function(editor) {
+            exec: function (editor) {
                 CodeMirror.commands.find(window["codemirror_" + editor.id]);
             },
             canUndo: true
@@ -1296,7 +1296,7 @@ CKEDITOR.plugins.sourcearea = {
             },
             editorFocus: false,
             readOnly: 0,
-            exec: function(editor) {
+            exec: function (editor) {
                 var range = {
                     from: window["codemirror_" + editor.id].getCursor(true),
                     to: window["codemirror_" + editor.id].getCursor(false)
@@ -1312,7 +1312,7 @@ CKEDITOR.plugins.sourcearea = {
             },
             editorFocus: false,
             readOnly: 0,
-            exec: function(editor) {
+            exec: function (editor) {
                 var range = {
                     from: window["codemirror_" + editor.id].getCursor(true),
                     to: window["codemirror_" + editor.id].getCursor(false)
@@ -1328,7 +1328,7 @@ CKEDITOR.plugins.sourcearea = {
             },
             editorFocus: false,
             readOnly: 0,
-            exec: function(editor) {
+            exec: function (editor) {
                 var range = {
                     from: window["codemirror_" + editor.id].getCursor(true),
                     to: window["codemirror_" + editor.id].getCursor(false)
@@ -1349,7 +1349,7 @@ CKEDITOR.plugins.sourcearea = {
             },
             editorFocus: false,
             readOnly: 1,
-            exec: function(editor) {
+            exec: function (editor) {
                 if (this.state == CKEDITOR.TRISTATE_ON) {
                     window["codemirror_" + editor.id].setOption("autoCloseTags", false);
                 } else if (this.state == CKEDITOR.TRISTATE_OFF) {
diff --git a/composer.json b/composer.json
index 6816e762..bf5d74e9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "ckeditor-codemirror-plugin",
   "homepage": "http://w8tcha.github.io/CKEditor-CodeMirror-Plugin/",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "authors": [
     "Ingo Herbote"
   ],
diff --git a/package.json b/package.json
index d77a672b..0b1bfeb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ckeditor-codemirror-plugin",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "author": "w8tcha",
   "description": "Syntax Highlighting for the CKEditor (Source View and Source Dialog) with the CodeMirror Plugin.",
   "repository": {