diff --git a/src/ua-parser.js b/src/ua-parser.js
index 0b8f6c4f..afcf232f 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -169,6 +169,17 @@
                     '2.0.4' : '/419',
                     '?'     : '/'
                 }
+            },
+            oldEdge : {
+                version : {
+                    '0.1'   : '12.',
+                    '21'    : '13.',
+                    '31'    : '14.',
+                    '39'    : '15.',
+                    '41'    : '16.',
+                    '42'    : '17.',
+                    '44'    : '18.'
+                }
             }
         },
 
@@ -221,7 +232,7 @@
             /(?:android.+crmo|crios)\/([\w\.]+)/i                               // Chrome for Android/iOS
             ], [VERSION, [NAME, 'Chrome']], [
             /(?:edge|edgios|edga|edg)\/((\d+)?[\w\.]+)/i                        // Microsoft Edge
-            ], [VERSION, [NAME, 'Edge']], [
+            ], [[VERSION, mapper.str, maps.browser.oldEdge.version], [NAME, 'Edge']], [
 
             // Presto based
             /(opera\smini)\/([\w\.-]+)/i,                                       // Opera Mini
diff --git a/test/browser-test.json b/test/browser-test.json
index 6ab7b578..99de8398 100644
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -1109,13 +1109,33 @@
         }
     },
     {
-        "desc"    : "Microsoft Edge",
+        "desc"    : "Microsoft Edge 0.1",
         "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0",
         "expect"  :
         {
             "name"    : "Edge",
-            "version" : "12.0",
-            "major"   : "12"
+            "version" : "0.1",
+            "major"   : "0"
+        }
+    },
+    {
+        "desc"    : "Microsoft Edge 44",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/17.17134",
+        "expect"  :
+        {
+            "name"    : "Edge",
+            "version" : "42",
+            "major"   : "42"
+        }
+    },
+    {
+        "desc"    : "Microsoft Edge 44",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/18.17763",
+        "expect"  :
+        {
+            "name"    : "Edge",
+            "version" : "44",
+            "major"   : "44"
         }
     },
     {