Fix #268 revert changes

bump version
Fix vulnerable regex in getOS() (as reported by Nick Starke)
2025-11-16 15:11:50 +03:00 · 2017-10-12 15:16:23 +07:00 · 2017-10-12 12:10:08 +07:00 · 2017-10-12 12:07:10 +07:00 · 2017-10-12 09:48:25 +07:00 · 2017-10-12 09:39:37 +07:00
12 changed files with 1214 additions and 510 deletions
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "ua-parser-js",
-  "version": "0.7.12",
+  "version": "0.7.17",
  "authors": [
    "Faisal Salman <fyzlman@gmail.com>"
  ],
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
--- a/dist/ua-parser.pack.js
+++ b/dist/ua-parser.pack.js
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  name: 'faisalman:ua-parser-js',
-  version: '0.7.12',
+  version: '0.7.17',
  summary: 'Lightweight JavaScript-based user-agent string parser',
  git: 'https://github.com/faisalman/ua-parser-js.git',
  documentation: 'readme.md'
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
  "title": "UAParser.js",
  "name": "ua-parser-js",
-  "version": "0.7.12",
-  "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
+  "version": "0.7.17",
+  "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
  "description": "Lightweight JavaScript-based user-agent string parser",
  "keywords": [
    "user-agent",
@@ -11,46 +11,81 @@
    "engine",
    "os",
    "device",
-    "cpu"
+    "cpu",
+    "jquery-plugin",
+    "ecosystem:jquery"
  ],
  "homepage": "http://github.com/faisalman/ua-parser-js",
  "contributors": [
-    "Faisal Salman <fyzlman@gmail.com>",
+    "Aamir Poonawalla <aamir@urx.com>",
+    "Admas <mollases@users.noreply.github.com>",
+    "algenon <m@antonz.ru>",
+    "Andrea Vaghi <andrea.vaghi@jobrapido.com>",
+    "Anton Zhiyanov <m@antonz.ru>",
+    "Austin Pray <austin@austinpray.com>",
    "Benjamin Bertrand <bertrand.design@gmail.com>",
+    "boneyao <admin@boneyao.com>",
    "Carl C Von Lewin <carlchristianlewin@gmail.com>",
+    "CESAR RAMOS <c@imagenproactiva.com>",
    "Christopher De Cairos <chris.decairos@gmail.com>",
    "Davit Barbakadze <jayarjo@gmail.com>",
+    "ddivernois <david-emmanuel.divernois@amadeus.com>",
+    "Demis Palma <demis.palma@gmail.com>",
    "Dmitry Tyschenko <dtyschenko@gmail.com>",
    "Douglas Li <doug@knotch.it>",
    "Dumitru Uzun <contact@duzun.me>",
    "Erik Hesselink <hesselink@gmail.com>",
    "Fabian Becker <halfdan@xnorfz.de>",
+    "Faisal Salman <fyzlman@gmail.com>",
+    "Frédéric Camblor <fcamblor@gmail.com>",
+    "Grigory Dmitrenko <grigory@snsk.ru>",
    "Hendrik Helwich <h.helwich@iplabs.de>",
-    "Jackpoll <jackpoll123456@gmail.com>",
+    "jackpoll <jackpoll123456@gmail.com>",
    "Jake Mc <startswithaj@users.noreply.github.com>",
    "John Tantalo <john.tantalo@gmail.com>",
    "John Yanarella <jmy@codecatalyst.com>",
    "Jon Buckley <jon@jbuckley.ca>",
    "Kendall Buchanan <kendall@kendagriff.com>",
    "Lee Treveil <leetreveil@gmail.com>",
-    "Leonardo <leofiore@libero.it>",
+    "leonardo <leofiore@libero.it>",
+    "Levente Balogh <noreply@github.com>",
+    "Liam Quinn <lquinn@blackberry.com>",
+    "Lithin <lithin@webklipper.com>",
+    "Lukas Eipert <leipert@users.noreply.github.com>",
+    "Malash <i@malash.me>",
+    "Martynas <noreply@github.com>",
+    "Maximilian Haupt <mail@maximilianhaupt.com>",
    "Max Maurer <maxemanuel.maurer@gmail.com>",
    "Michael Hess <mhess@connectify.me>",
-    "OtakuSiD <otakusid@gmail.com>",
+    "naoh <noreply@github.com>",
+    "Nik Rolls <nik@rolls.cc>",
+    "niris <nirisix@gmail.com>",
+    "otakuSiD <otakusid@gmail.com>",
+    "Peter Dave Hello <PeterDaveHello@users.noreply.github.com>",
+    "philippsimon <github@philippsimon.de>",
+    "Pieter Hendrickx <pieter.hendrickx@belfius.be>",
+    "Robert Tod <robert@qubit.com>",
    "Ross Noble <rosshnoble@gmail.com>",
-    "Sandro Sonntag <sandro.sonntag@adorsys.de>"
+    "Sandro Sonntag <sandro.sonntag@adorsys.de>",
+    "sgautrea <shanegautreau@gmail.com>",
+    "Shane Gautreau <sgautrea@opentext.com>",
+    "Shane Thacker <shane@steadymade.com>",
+    "Simon Eisenmann <simon@longsleep.org>",
+    "Simon Lang <me@simonlang.org>",
+    "Sylvain Gizard <sylvain.gizard@gmail.com>",
+    "szchenghuang <szchenghuang@gmail.com>",
+    "Vadim Kurachevsky <vadim@hmvs.org>",
+    "Yun Young-jin <yupmin@yupmin-office-macmini.local>"
  ],
  "main": "src/ua-parser.js",
  "scripts": {
-    "build": "uglifyjs src/ua-parser.js > dist/ua-parser.min.js --comments '/UAParser\\.js/' && uglifyjs src/ua-parser.js > dist/ua-parser.pack.js --comments '/UAParser\\.js/' --compress --mangle",
+    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/UAParser\\.js/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/UAParser\\.js/' --compress --mangle",
    "test": "jshint src/ua-parser.js && mocha -R nyan test/test.js",
    "verup": "node ./node_modules/verup",
    "version": "node ./node_modules/verup 0"
  },
  "verup": {
    "files": [
-      "ua-parser-js.jquery.json",
-      "component.json",
      "bower.json",
      "package.js",
      "src/ua-parser.js"
@@ -64,7 +99,7 @@
    "jshint": "~1.1.0",
    "mocha": "~1.8.0",
    "requirejs": "^2.3.2",
-    "uglify-js": "~1.3.4",
+    "uglify-js": "~2.7.5",
    "verup": "^1.3.x"
  },
  "repository": {
@@ -79,5 +114,8 @@
    "dist": "dist",
    "src": "src",
    "test": "test"
-  }
+  },
+  "bugs": "https://github.com/faisalman/ua-parser-js/issues",
+  "demo": "https://faisalman.github.io/ua-parser-js",
+  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.min.js"
 }
--- a/readme.md
+++ b/readme.md
@@ -1,18 +1,26 @@
 # UAParser.js

-<img align="right" src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/logo.png"> A not-so-lightweight-anymore JavaScript-based User-Agent string parser. Can be used either in browser (client-side) or in node.js (server-side) environment. Also available as jQuery/Zepto plugin, Bower/Meteor package, & RequireJS/AMD module. This library aims to identify detailed type of web browser, layout engine, operating system, cpu architecture, and device type/model, entirely from user-agent string with a relatively small footprint (~11KB when minified / ~4KB gzipped). Written in vanilla JavaScript, which means it doesn't require any other library and can be used independently.
+<img align="right" src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/logo.png"> A JavaScript-based User-Agent string parser. Can be used either in browser (client-side) or in node.js (server-side) environment. Also available as jQuery/Zepto plugin, Bower/Meteor package, & RequireJS/AMD module. This library aims to identify detailed type of web browser, layout engine, operating system, cpu architecture, and device type/model, entirely from user-agent string with a relatively small footprint (~11KB when minified / ~4KB gzipped). Written in vanilla JavaScript, which means it doesn't require any other library and can be used independently. However, it's not recommended to use this library as browser detection since the result may not accurate than using feature detection.

 [![Build Status](https://travis-ci.org/faisalman/ua-parser-js.svg?branch=master)](https://travis-ci.org/faisalman/ua-parser-js)
+[![NPM downloads](https://img.shields.io/npm/dw/ua-parser-js.svg)](https://www.npmjs.com/package/ua-parser-js)
 [![NPM](https://img.shields.io/npm/v/ua-parser-js.svg)](https://www.npmjs.com/package/ua-parser-js)
 [![Bower](https://img.shields.io/bower/v/ua-parser-js.svg)](https://bower.io/)
 [![CDNJS](https://img.shields.io/cdnjs/v/UAParser.js.svg)](https://cdnjs.com/libraries/UAParser.js)
 [![Gratipay](https://img.shields.io/gratipay/team/UAParser.js.svg)](https://gratipay.com/UAParser.js)
 [![Flattr this](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/3867907/faisalmanua-parser-js-on-GitHub)

-* Author    : Faisal Salman <<fyzlman@gmail.com>>
+* Author    : Faisal Salman <<f@faisalman.com>>
 * Demo      : http://faisalman.github.io/ua-parser-js
 * Source    : https://github.com/faisalman/ua-parser-js

+# Constructor
+
+* `new UAParser([uastring][,extensions])`
+    * returns new instance
+
+* `UAParser([uastring][,extensions])`
+    * returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`

 # Methods

@@ -21,14 +29,14 @@

 ```
 # Possible 'browser.name':
-Amaya, Android Browser, Arora, Avant, Baidu, Blazer, Bolt, Camino, Chimera, Chrome, 
-Chromium, Comodo Dragon, Conkeror, Dillo, Dolphin, Doris, Edge, Epiphany, Fennec,
-Firebird, Firefox, Flock, GoBrowser, iCab, ICE Browser, IceApe, IceCat, IceDragon, 
-Iceweasel, IE [Mobile], Iron, Jasmine, K-Meleon, Konqueror, Kindle, Links, 
-Lunascape, Lynx, Maemo, Maxthon, Midori, Minimo, MIUI Browser, [Mobile] Safari, 
+Amaya, Android Browser, Arora, Avant, Baidu, Blazer, Bolt, Bowser, Camino, Chimera, 
+Chrome [WebView], Chromium, Comodo Dragon, Conkeror, Dillo, Dolphin, Doris, Edge, 
+Epiphany, Fennec, Firebird, Firefox, Flock, GoBrowser, iCab, ICE Browser, IceApe, 
+IceCat, IceDragon, Iceweasel, IE[Mobile], Iron, Jasmine, K-Meleon, Konqueror, Kindle, 
+Links, Lunascape, Lynx, Maemo, Maxthon, Midori, Minimo, MIUI Browser, [Mobile] Safari, 
 Mosaic, Mozilla, Netfront, Netscape, NetSurf, Nokia, OmniWeb, Opera [Mini/Mobi/Tablet], 
-PhantomJS, Phoenix, Polaris, QQBrowser, RockMelt, Silk, Skyfire, SeaMonkey, SlimBrowser,
-Swiftfox, Tizen, UCBrowser, Vivaldi, w3m, WeChat, Yandex
+PhantomJS, Phoenix, Polaris, QQBrowser, RockMelt, Silk, Skyfire, SeaMonkey, Sleipnir, 
+SlimBrowser, Swiftfox, Tizen, UCBrowser, Vivaldi, w3m, WeChat, Yandex

 # 'browser.version' determined dynamically
 ```
@@ -43,8 +51,8 @@ console, mobile, tablet, smarttv, wearable, embedded
 # Possible 'device.vendor':
 Acer, Alcatel, Amazon, Apple, Archos, Asus, BenQ, BlackBerry, Dell, GeeksPhone, 
 Google, HP, HTC, Huawei, Jolla, Lenovo, LG, Meizu, Microsoft, Motorola, Nexian, 
-Nintendo, Nokia, Nvidia, Ouya, Palm, Panasonic, Polytron, RIM, Samsung, Sharp, 
-Siemens, Sony-Ericsson, Sprint, Xbox, ZTE
+Nintendo, Nokia, Nvidia, OnePlus, Ouya, Palm, Panasonic, Pebble, Polytron, RIM, 
+Samsung, Sharp, Siemens, Sony[Ericsson], Sprint, Xbox, Xiaomi, ZTE

 # 'device.model' determined dynamically
 ```
@@ -68,7 +76,7 @@ Tasman, Trident, w3m, WebKit
 AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS, Contiki,
 Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Gentoo, GNU, Haiku, Hurd, iOS, 
 Joli, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo, Minix, Mint, Morph OS, NetBSD, 
-Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PCLinuxOS, Plan9, Playstation, QNX, RedHat, 
+Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD, PCLinuxOS, Plan9, Playstation, QNX, RedHat, 
 RIM Tablet OS, RISC OS, Sailfish, Series40, Slackware, Solaris, SUSE, Symbian, Tizen, 
 Ubuntu, UNIX, VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk

@@ -80,8 +88,7 @@ Ubuntu, UNIX, VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk

 ```
 # Possible 'cpu.architecture'
-68k, amd64, arm, arm64, avr, ia32, ia64, irix, irix64, mips, mips64, pa-risc, 
-ppc, sparc, sparc64
+68k, amd64, arm[64], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, sparc[64]
 ```

 * `getResult()`
@@ -91,7 +98,8 @@ ppc, sparc, sparc64
    * returns UA string of current instance

 * `setUA(uastring)`
-    * set & parse UA string
+    * set UA string to parse
+    * returns current instance


 # Example
@@ -204,6 +212,12 @@ requirejs(['ua-parser-js'], function(UAParser) {
 });
 ```

+## Using CDN
+
+```html
+<script src="https://cdn.jsdelivr.net/npm/ua-parser-js@0/dist/ua-parser.min.js"></script>
+```
+
 ## Using bower

 ```sh
@@ -216,6 +230,18 @@ $ bower install ua-parser-js
 $ meteor add faisalman:ua-parser-js
 ```

+## Using CLI
+
+```sh
+$ node ua-parser.min.js "Mozilla/4.0 (compatible; MSIE 4.01; Windows 98)"
+# multiple args
+$ node ua-parser.min.js "Opera/1.2" "Opera/3.4"
+# piped args
+$ echo "Opera/1.2" | node ua-parser.min.js
+# log file
+$ cat ua.log | node ua-parser.min.js
+```
+
 ## Using jQuery/Zepto ($.ua)

 Although written in vanilla js (which means it doesn't depends on jQuery), this library will automatically detect if jQuery/Zepto is present and create `$.ua` object based on browser's user-agent (although in case you need, `window.UAParser` constructor is still present). To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`. 
@@ -237,20 +263,24 @@ console.log($.ua.browser.name);     // "Safari"
 console.log($.ua.engine.name);      // "Webkit"
 console.log($.ua.device);           // {vendor: "Motorola", model: "Xoom", type: "tablet"}
 console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
+
+// Add class to <body> tag
+// <body class="ua-browser-safari ua-devicetype-tablet">
+$('body').addClass('ua-browser-' + $.ua.browser.name + ' ua-devicetype-' + $.ua.device.type);
 ```

 ## Extending regex patterns

-* `UAParser(uastring[, extensions])`
+* `UAParser([uastring,] extensions)`

 Pass your own regexes to extend the limited matching rules.

 ```js
 // Example:
-var uaString = 'MyOwnBrowser/1.3';
 var myOwnRegex = [[/(myownbrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION]];
-var parser = new UAParser(uaString, { browser: myOwnRegex });
-console.log(parser.getBrowser());   // {name: "MyOwnBrowser", version: "1.3"}
+var myParser = new UAParser({ browser: myOwnRegex });
+var uaString = 'Mozilla/5.0 MyOwnBrowser/1.3';
+console.log(myParser.setUA(uaString).getBrowser());   // {name: "MyOwnBrowser", version: "1.3"}
 ```


@@ -261,15 +291,10 @@ console.log(parser.getBrowser());   // {name: "MyOwnBrowser", version: "1.3"}
 * Fork and clone this repository
 * Make some changes as required
 * Write a unit test to showcase your feature
-* Run the test suites to make sure the changes you made didn't break anything
-
-```sh
-$ npm run test
-```
-
+* Run the test suites to make sure the changes you made didn't break anything `$ npm run test`
 * Commit and push to your own repository
 * Submit a pull request to this repository under `develop` branch
-* Profit?
+* Profit? $$$

 ## Build

@@ -280,6 +305,13 @@ $ npm run build
 ```


+# Donate
+
+Do you use & like UAParser.js but you don’t find a way to show some love? If yes, please consider donating to support this project. Otherwise, no worries, regardless of whether there is support or not, I will keep maintaining this project. Still, if you buy me a cup of coffee I would be more than happy though :)
+
+[![Support via Pledgie](https://pledgie.com/campaigns/34252.png?skin_name=chrome)](https://pledgie.com/campaigns/34252)
+
+
 # License

 Dual licensed under GPLv2 & MIT
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -1,5 +1,5 @@
 /**
- * UAParser.js v0.7.12
+ * UAParser.js v0.7.17
 * Lightweight JavaScript-based User-Agent string parser
 * https://github.com/faisalman/ua-parser-js
 *
@@ -16,7 +16,7 @@
    /////////////


-    var LIBVERSION  = '0.7.12',
+    var LIBVERSION  = '0.7.17',
        EMPTY       = '',
        UNKNOWN     = '?',
        FUNC_TYPE   = 'function',
@@ -81,35 +81,29 @@

    var mapper = {

-        rgx : function () {
+        rgx : function (ua, arrays) {

-            var result, i = 0, j, k, p, q, matches, match, args = arguments;
+            //var result = {},
+            var i = 0, j, k, p, q, matches, match;//, args = arguments;
+
+            /*// construct object barebones
+            for (p = 0; p < args[1].length; p++) {
+                q = args[1][p];
+                result[typeof q === OBJ_TYPE ? q[0] : q] = undefined;
+            }*/

            // loop through all regexes maps
-            while (i < args.length && !matches) {
+            while (i < arrays.length && !matches) {

-                var regex = args[i],       // even sequence (0,2,4,..)
-                    props = args[i + 1];   // odd sequence (1,3,5,..)
-
-                // construct object barebones
-                if (typeof result === UNDEF_TYPE) {
-                    result = {};
-                    for (p in props) {
-                        if (props.hasOwnProperty(p)){
-                            q = props[p];
-                            if (typeof q === OBJ_TYPE) {
-                                result[q[0]] = undefined;
-                            } else {
-                                result[q] = undefined;
-                            }
-                        }
-                    }
-                }
+                var regex = arrays[i],       // even sequence (0,2,4,..)
+                    props = arrays[i + 1];   // odd sequence (1,3,5,..)
+                j = k = 0;

                // try matching uastring with regexes
-                j = k = 0;
                while (j < regex.length && !matches) {
-                    matches = regex[j++].exec(this.getUA());
+
+                    matches = regex[j++].exec(ua);
+
                    if (!!matches) {
                        for (p = 0; p < props.length; p++) {
                            match = matches[++k];
@@ -119,32 +113,33 @@
                                if (q.length == 2) {
                                    if (typeof q[1] == FUNC_TYPE) {
                                        // assign modified match
-                                        result[q[0]] = q[1].call(this, match);
+                                        this[q[0]] = q[1].call(this, match);
                                    } else {
                                        // assign given value, ignore regex match
-                                        result[q[0]] = q[1];
+                                        this[q[0]] = q[1];
                                    }
                                } else if (q.length == 3) {
                                    // check whether function or regex
                                    if (typeof q[1] === FUNC_TYPE && !(q[1].exec && q[1].test)) {
                                        // call function (usually string mapper)
-                                        result[q[0]] = match ? q[1].call(this, match, q[2]) : undefined;
+                                        this[q[0]] = match ? q[1].call(this, match, q[2]) : undefined;
                                    } else {
                                        // sanitize match using given regex
-                                        result[q[0]] = match ? match.replace(q[1], q[2]) : undefined;
+                                        this[q[0]] = match ? match.replace(q[1], q[2]) : undefined;
                                    }
                                } else if (q.length == 4) {
-                                        result[q[0]] = match ? q[3].call(this, match.replace(q[1], q[2])) : undefined;
+                                        this[q[0]] = match ? q[3].call(this, match.replace(q[1], q[2])) : undefined;
                                }
                            } else {
-                                result[q] = match ? match : undefined;
+                                this[q] = match ? match : undefined;
                            }
                        }
                    }
                }
                i += 2;
            }
-            return result;
+            // console.log(this);
+            //return this;
        },

        str : function (str, map) {
@@ -259,8 +254,8 @@

            // Webkit/KHTML based
            /(rekonq)\/([\w\.]+)*/i,                                            // Rekonq
-            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs)\/([\w\.-]+)/i
-                                                                                // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS
+            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser)\/([\w\.-]+)/i
+                                                                                // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser
            ], [NAME, VERSION], [

            /(trident).+rv[:\s]([\w\.]+).+like\sgecko/i                         // IE11
@@ -272,42 +267,55 @@
            /(yabrowser)\/([\w\.]+)/i                                           // Yandex
            ], [[NAME, 'Yandex'], VERSION], [

+            /(puffin)\/([\w\.]+)/i                                              // Puffin
+            ], [[NAME, 'Puffin'], VERSION], [
+
+            /((?:[\s\/])uc?\s?browser|(?:juc.+)ucweb)[\/\s]?([\w\.]+)/i
+                                                                                // UCBrowser
+            ], [[NAME, 'UCBrowser'], VERSION], [
+
            /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
            ], [[NAME, /_/g, ' '], VERSION], [

            /(micromessenger)\/([\w\.]+)/i                                      // WeChat
            ], [[NAME, 'WeChat'], VERSION], [

+            /(QQ)\/([\d\.]+)/i                                                  // QQ, aka ShouQ
+            ], [NAME, VERSION], [
+
+            /m?(qqbrowser)[\/\s]?([\w\.]+)/i                                    // QQBrowser
+            ], [NAME, VERSION], [
+
            /xiaomi\/miuibrowser\/([\w\.]+)/i                                   // MIUI Browser
            ], [VERSION, [NAME, 'MIUI Browser']], [

+            /;fbav\/([\w\.]+);/i                                                // Facebook App for iOS & Android
+            ], [VERSION, [NAME, 'Facebook']], [
+
+            /headlesschrome(?:\/([\w\.]+)|\s)/i                                 // Chrome Headless
+            ], [VERSION, [NAME, 'Chrome Headless']], [
+
            /\swv\).+(chrome)\/([\w\.]+)/i                                      // Chrome WebView
            ], [[NAME, /(.+)/, '$1 WebView'], VERSION], [

-            /android.+samsungbrowser\/([\w\.]+)/i,
+            /((?:oculus|samsung)browser)\/([\w\.]+)/i
+            ], [[NAME, /(.+(?:g|us))(.+)/, '$1 $2'], VERSION], [                // Oculus / Samsung Browser
+
            /android.+version\/([\w\.]+)\s+(?:mobile\s?safari|safari)*/i        // Android Browser
            ], [VERSION, [NAME, 'Android Browser']], [

-            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i,
+            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i
                                                                                // Chrome/OmniWeb/Arora/Tizen/Nokia
-            /(qqbrowser)[\/\s]?([\w\.]+)/i
-                                                                                // QQBrowser
            ], [NAME, VERSION], [

-            /(uc\s?browser)[\/\s]?([\w\.]+)/i,
-            /ucweb.+(ucbrowser)[\/\s]?([\w\.]+)/i,
-            /juc.+(ucweb)[\/\s]?([\w\.]+)/i
-                                                                                // UCBrowser
-            ], [[NAME, 'UCBrowser'], VERSION], [
-
            /(dolfin)\/([\w\.]+)/i                                              // Dolphin
            ], [[NAME, 'Dolphin'], VERSION], [

            /((?:android.+)crmo|crios)\/([\w\.]+)/i                             // Chrome for Android/iOS
            ], [[NAME, 'Chrome'], VERSION], [

-            /;fbav\/([\w\.]+);/i                                                // Facebook App for iOS
-            ], [VERSION, [NAME, 'Facebook']], [
+            /(coast)\/([\w\.]+)/i                                               // Opera Coast
+            ], [[NAME, 'Opera Coast'], VERSION], [

            /fxios\/([\w\.-]+)/i                                                // Firefox for iOS
            ], [VERSION, [NAME, 'Firefox']], [
@@ -318,6 +326,9 @@
            /version\/([\w\.]+).+?(mobile\s?safari|safari)/i                    // Safari & Safari Mobile
            ], [VERSION, NAME], [

+            /webkit.+?(gsa)\/([\w\.]+).+?(mobile\s?safari|safari)(\/[\w\.]+)/i  // Google Search Appliance on iOS
+            ], [[NAME, 'GSA'], VERSION], [
+
            /webkit.+?(mobile\s?safari|safari)(\/[\w\.]+)/i                     // Safari < 3.0
            ], [NAME, [VERSION, mapper.str, maps.browser.oldsafari.version]], [

@@ -512,8 +523,8 @@
            ], [MODEL, [VENDOR, 'Apple'], [TYPE, MOBILE]], [

            /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|huawei|meizu|motorola|polytron)[\s_-]?([\w-]+)*/i,
-                                                                                // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Huawei/Meizu/Motorola/Polytron
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[\s_-]?([\w-]+)*/i,
+                                                                                // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
            /(hp)\s([\w\s]+\w)/i,                                               // HP iPAQ
            /(asus)-?(\w+)/i                                                    // Asus
            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
@@ -526,8 +537,8 @@
            /(sony)\s(tablet\s[ps])\sbuild\//i,                                  // Sony
            /(sony)?(?:sgp.+)\sbuild\//i
            ], [[VENDOR, 'Sony'], [MODEL, 'Xperia Tablet'], [TYPE, TABLET]], [
-            /(?:sony)?(?:(?:(?:c|d)\d{4})|(?:so[-l].+))\sbuild\//i
-            ], [[VENDOR, 'Sony'], [MODEL, 'Xperia Phone'], [TYPE, MOBILE]], [
+            /android.+\s([c-g]\d{4}|so[-l]\w+)\sbuild\//i
+            ], [MODEL, [VENDOR, 'Sony'], [TYPE, MOBILE]], [

            /\s(ouya)\s/i,                                                      // Ouya
            /(nintendo)\s([wids3u]+)/i                                          // Nintendo
@@ -547,14 +558,15 @@

            /(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i,                               // HTC
            /(zte)-(\w+)*/i,                                                    // ZTE
-            /(alcatel|geeksphone|huawei|lenovo|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]+)*/i
-                                                                                // Alcatel/GeeksPhone/Huawei/Lenovo/Nexian/Panasonic/Sony
+            /(alcatel|geeksphone|lenovo|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]+)*/i
+                                                                                // Alcatel/GeeksPhone/Lenovo/Nexian/Panasonic/Sony
            ], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [

            /(nexus\s9)/i                                                       // HTC Nexus 9
            ], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [

-            /(nexus\s6p)/i                                                      // Huawei Nexus 6P
+            /d\/huawei([\w\s-]+)[;\)]/i,
+            /(nexus\s6p)/i                                                      // Huawei
            ], [MODEL, [VENDOR, 'Huawei'], [TYPE, MOBILE]], [

            /(microsoft);\s(lumia[\s\w]+)/i                                     // Microsoft Lumia
@@ -603,12 +615,15 @@
            /android\s3\.[\s\w;-]{10}(a\d{3})/i                                 // Acer
            ], [MODEL, [VENDOR, 'Acer'], [TYPE, TABLET]], [

+            /android.+([vl]k\-?\d{3})\s+build/i                                 // LG Tablet
+            ], [MODEL, [VENDOR, 'LG'], [TYPE, TABLET]], [
            /android\s3\.[\s\w;-]{10}(lg?)-([06cv9]{3,4})/i                     // LG Tablet
            ], [[VENDOR, 'LG'], MODEL, [TYPE, TABLET]], [
            /(lg) netcast\.tv/i                                                 // LG SmartTV
            ], [VENDOR, MODEL, [TYPE, SMARTTV]], [
            /(nexus\s[45])/i,                                                   // LG
-            /lg[e;\s\/-]+(\w+)*/i
+            /lg[e;\s\/-]+(\w+)*/i,
+            /android.+lg(\-?[\d\w]+)\s+build/i
            ], [MODEL, [VENDOR, 'LG'], [TYPE, MOBILE]], [

            /android.+(ideatab[a-z0-9\-\s]+)/i                                  // Lenovo
@@ -620,20 +635,105 @@
            /((pebble))app\/[\d\.]+\s/i                                         // Pebble
            ], [VENDOR, MODEL, [TYPE, WEARABLE]], [

+            /android.+;\s(oppo)\s?([\w\s]+)\sbuild/i                            // OPPO
+            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
+
+            /crkey/i                                                            // Google Chromecast
+            ], [[MODEL, 'Chromecast'], [VENDOR, 'Google']], [
+
            /android.+;\s(glass)\s\d/i                                          // Google Glass
            ], [MODEL, [VENDOR, 'Google'], [TYPE, WEARABLE]], [

+            /android.+;\s(pixel c)\s/i                                          // Google Pixel C
+            ], [MODEL, [VENDOR, 'Google'], [TYPE, TABLET]], [
+
+            /android.+;\s(pixel xl|pixel)\s/i                                   // Google Pixel
+            ], [MODEL, [VENDOR, 'Google'], [TYPE, MOBILE]], [
+
            /android.+(\w+)\s+build\/hm\1/i,                                    // Xiaomi Hongmi 'numeric' models
            /android.+(hm[\s\-_]*note?[\s_]*(?:\d\w)?)\s+build/i,               // Xiaomi Hongmi
-            /android.+(mi[\s\-_]*(?:one|one[\s_]plus|note lte)?[\s_]*(?:\d\w)?)\s+build/i    // Xiaomi Mi
+            /android.+(mi[\s\-_]*(?:one|one[\s_]plus|note lte)?[\s_]*(?:\d\w)?)\s+build/i,    // Xiaomi Mi
+            /android.+(redmi[\s\-_]*(?:note)?(?:[\s_]*[\w\s]+)?)\s+build/i      // Redmi Phones
            ], [[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, MOBILE]], [
+            /android.+(mi[\s\-_]*(?:pad)?(?:[\s_]*[\w\s]+)?)\s+build/i          // Mi Pad tablets
+            ],[[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, TABLET]], [
+            /android.+;\s(m[1-5]\snote)\sbuild/i                                // Meizu Tablet
+            ], [MODEL, [VENDOR, 'Meizu'], [TYPE, TABLET]], [

            /android.+a000(1)\s+build/i                                         // OnePlus
            ], [MODEL, [VENDOR, 'OnePlus'], [TYPE, MOBILE]], [

-            /\s(tablet)[;\/]/i,                                                 // Unidentifiable Tablet
+            /android.+[;\/]\s*(RCT[\d\w]+)\s+build/i                            // RCA Tablets
+            ], [MODEL, [VENDOR, 'RCA'], [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*(Venue[\d\s]*)\s+build/i                          // Dell Venue Tablets
+            ], [MODEL, [VENDOR, 'Dell'], [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*(Q[T|M][\d\w]+)\s+build/i                         // Verizon Tablet
+            ], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [
+
+            /android.+[;\/]\s+(Barnes[&\s]+Noble\s+|BN[RT])(V?.*)\s+build/i     // Barnes & Noble Tablet
+            ], [[VENDOR, 'Barnes & Noble'], MODEL, [TYPE, TABLET]], [
+
+            /android.+[;\/]\s+(TM\d{3}.*\b)\s+build/i                           // Barnes & Noble Tablet
+            ], [MODEL, [VENDOR, 'NuVision'], [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*(zte)?.+(k\d{2})\s+build/i                        // ZTE K Series Tablet
+            ], [[VENDOR, 'ZTE'], MODEL, [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*(gen\d{3})\s+build.*49h/i                         // Swiss GEN Mobile
+            ], [MODEL, [VENDOR, 'Swiss'], [TYPE, MOBILE]], [
+
+            /android.+[;\/]\s*(zur\d{3})\s+build/i                              // Swiss ZUR Tablet
+            ], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*((Zeki)?TB.*\b)\s+build/i                         // Zeki Tablets
+            ], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [
+
+            /(android).+[;\/]\s+([YR]\d{2}x?.*)\s+build/i,
+            /android.+[;\/]\s+(Dragon[\-\s]+Touch\s+|DT)(.+)\s+build/i          // Dragon Touch Tablet
+            ], [[VENDOR, 'Dragon Touch'], MODEL, [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*(NS-?.+)\s+build/i                                // Insignia Tablets
+            ], [MODEL, [VENDOR, 'Insignia'], [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*((NX|Next)-?.+)\s+build/i                         // NextBook Tablets
+            ], [MODEL, [VENDOR, 'NextBook'], [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*(Xtreme\_?)?(V(1[045]|2[015]|30|40|60|7[05]|90))\s+build/i
+            ], [[VENDOR, 'Voice'], MODEL, [TYPE, MOBILE]], [                    // Voice Xtreme Phones
+
+            /android.+[;\/]\s*(LVTEL\-?)?(V1[12])\s+build/i                     // LvTel Phones
+            ], [[VENDOR, 'LvTel'], MODEL, [TYPE, MOBILE]], [
+
+            /android.+[;\/]\s*(V(100MD|700NA|7011|917G).*\b)\s+build/i          // Envizen Tablets
+            ], [MODEL, [VENDOR, 'Envizen'], [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*(Le[\s\-]+Pan)[\s\-]+(.*\b)\s+build/i             // Le Pan Tablets
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*(Trio[\s\-]*.*)\s+build/i                         // MachSpeed Tablets
+            ], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*(Trinity)[\-\s]*(T\d{3})\s+build/i                // Trinity Tablets
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+
+            /android.+[;\/]\s*TU_(1491)\s+build/i                               // Rotor Tablets
+            ], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]], [
+
+            /android.+(KS(.+))\s+build/i                                        // Amazon Kindle Tablets
+            ], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
+
+            /android.+(Gigaset)[\s\-]+(Q.+)\s+build/i                           // Gigaset Tablets
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+
+            /\s(tablet|tab)[;\/]/i,                                             // Unidentifiable Tablet
            /\s(mobile)(?:[;\/]|\ssafari)/i                                     // Unidentifiable Mobile
-            ], [[TYPE, util.lowerize], VENDOR, MODEL]
+            ], [[TYPE, util.lowerize], VENDOR, MODEL], [
+
+            /(android.+)[;\/].+build/i                                          // Generic Android Device
+            ], [MODEL, [VENDOR, 'Generic']]
+

        /*//////////////////////////
            // TODO: move to string map
@@ -659,17 +759,6 @@
            /(SM-T311)/i                                                        // Samsung Galaxy Tab 3 8.0
            ], [[MODEL, 'Galaxy Tab 3 8.0'], [VENDOR, 'Samsung'], [TYPE, TABLET]], [

-            /(R1001)/i                                                          // Oppo R1001
-            ], [MODEL, [VENDOR, 'OPPO'], [TYPE, MOBILE]], [
-            /(X9006)/i                                                          // Oppo Find 7a
-            ], [[MODEL, 'Find 7a'], [VENDOR, 'Oppo'], [TYPE, MOBILE]], [
-            /(R2001)/i                                                          // Oppo YOYO R2001
-            ], [[MODEL, 'Yoyo R2001'], [VENDOR, 'Oppo'], [TYPE, MOBILE]], [
-            /(R815)/i                                                           // Oppo Clover R815
-            ], [[MODEL, 'Clover R815'], [VENDOR, 'Oppo'], [TYPE, MOBILE]], [
-             /(U707)/i                                                          // Oppo Find Way S
-            ], [[MODEL, 'Find Way S'], [VENDOR, 'Oppo'], [TYPE, MOBILE]], [
-
            /(T3C)/i                                                            // Advan Vandroid T3C
            ], [MODEL, [VENDOR, 'Advan'], [TYPE, TABLET]], [
            /(ADVAN T1J\+)/i                                                    // Advan Vandroid T1J+
@@ -768,8 +857,9 @@
            /(haiku)\s(\w+)/i                                                  // Haiku
            ], [NAME, VERSION],[

-            /(ip[honead]+)(?:.*os\s([\w]+)*\slike\smac|;\sopera)/i              // iOS
-            ], [[NAME, 'iOS'], [VERSION, /_/g, '.']], [
+            /cfnetwork\/.+darwin/i,
+            /ip[honead]+(?:.*os\s([\w]+)\slike\smac|;\sopera)/i                 // iOS
+            ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [

            /(mac\sos\sx)\s?([\w\s\.]+\w)*/i,
            /(macintosh|mac(?=_powerpc)\s)/i                                    // Mac OS
@@ -789,33 +879,66 @@
    /////////////////
    // Constructor
    ////////////////
-
-
+    /*
+    var Browser = function (name, version) {
+        this[NAME] = name;
+        this[VERSION] = version;
+    };
+    var CPU = function (arch) {
+        this[ARCHITECTURE] = arch;
+    };
+    var Device = function (vendor, model, type) {
+        this[VENDOR] = vendor;
+        this[MODEL] = model;
+        this[TYPE] = type;
+    };
+    var Engine = Browser;
+    var OS = Browser;
+    */
    var UAParser = function (uastring, extensions) {

+        if (typeof uastring === 'object') {
+            extensions = uastring;
+            uastring = undefined;
+        }
+
        if (!(this instanceof UAParser)) {
            return new UAParser(uastring, extensions).getResult();
        }

        var ua = uastring || ((window && window.navigator && window.navigator.userAgent) ? window.navigator.userAgent : EMPTY);
        var rgxmap = extensions ? util.extend(regexes, extensions) : regexes;
+        //var browser = new Browser();
+        //var cpu = new CPU();
+        //var device = new Device();
+        //var engine = new Engine();
+        //var os = new OS();

        this.getBrowser = function () {
-            var browser = mapper.rgx.apply(this, rgxmap.browser);
-            browser.major = util.major(browser.version);
+            var browser = { name: undefined, version: undefined };
+            mapper.rgx.call(browser, ua, rgxmap.browser);
+            browser.major = util.major(browser.version); // deprecated
            return browser;
        };
        this.getCPU = function () {
-            return mapper.rgx.apply(this, rgxmap.cpu);
+            var cpu = { architecture: undefined };
+            mapper.rgx.call(cpu, ua, rgxmap.cpu);
+            return cpu;
        };
        this.getDevice = function () {
-            return mapper.rgx.apply(this, rgxmap.device);
+            var device = { vendor: undefined, model: undefined, type: undefined };
+            mapper.rgx.call(device, ua, rgxmap.device);
+            return device;
        };
        this.getEngine = function () {
-            return mapper.rgx.apply(this, rgxmap.engine);
+            var engine = { name: undefined, version: undefined };
+            mapper.rgx.call(engine, ua, rgxmap.engine);
+            return engine;
        };
        this.getOS = function () {
-            return mapper.rgx.apply(this, rgxmap.os);
+            var os = { name: undefined, version: undefined };
+            mapper.rgx.call(os, ua, rgxmap.os);
+            return os;
        };
        this.getResult = function () {
            return {
@@ -832,6 +955,11 @@
        };
        this.setUA = function (uastring) {
            ua = uastring;
+            //browser = new Browser();
+            //cpu = new CPU();
+            //device = new Device();
+            //engine = new Engine();
+            //os = new OS();
            return this;
        };
        return this;
@@ -865,7 +993,7 @@
        NAME    : NAME,
        VERSION : VERSION
    };
-
+    //UAParser.Utils = util;

    ///////////
    // Export
@@ -878,6 +1006,35 @@
        if (typeof module !== UNDEF_TYPE && module.exports) {
            exports = module.exports = UAParser;
        }
+        // TODO: test!!!!!!!!
+        /*
+        if (require && require.main === module && process) {
+            // cli
+            var jsonize = function (arr) {
+                var res = [];
+                for (var i in arr) {
+                    res.push(new UAParser(arr[i]).getResult());
+                }
+                process.stdout.write(JSON.stringify(res, null, 2) + '\n');
+            };
+            if (process.stdin.isTTY) {
+                // via args
+                jsonize(process.argv.slice(2));
+            } else {
+                // via pipe
+                var str = '';
+                process.stdin.on('readable', function() {
+                    var read = process.stdin.read();
+                    if (read !== null) {
+                        str += read;
+                    }
+                });
+                process.stdin.on('end', function () {
+                    jsonize(str.replace(/\n$/, '').split('\n'));
+                });
+            }
+        }
+        */
        exports.UAParser = UAParser;
    } else {
        // requirejs env (optional)
@@ -885,7 +1042,7 @@
            define(function () {
                return UAParser;
            });
-        } else {
+        } else if (window) {
            // browser env
            window.UAParser = UAParser;
        }
@@ -896,7 +1053,7 @@
    //   In AMD env the global scope should be kept clean, but jQuery is an exception.
    //   jQuery always exports to global scope, unless jQuery.noConflict(true) is used,
    //   and we should catch that.
-    var $ = window.jQuery || window.Zepto;
+    var $ = window && (window.jQuery || window.Zepto);
    if (typeof $ !== UNDEF_TYPE) {
        var parser = new UAParser();
        $.ua = parser.getResult();
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -54,7 +54,7 @@
        "ua"      : "Mozilla/5.0 (Linux; Android 5.0.2; SAMSUNG SM-G925F Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/3.0 Chrome/38.0.2125.102 Mobile Safari/537.36",
        "expect"  :
        {
-            "name"    : "Android Browser",
+            "name"    : "Samsung Browser",
            "version" : "3.0",
            "major"   : "3"
        }
@@ -99,6 +99,16 @@
            "major"   : "0"
        }
    },
+    {
+        "desc"    : "Bowser",
+        "ua"      : "Mozilla/5.0 (iOS; like Mac OS X) AppleWebKit/536.36 (KHTML, like Gecko) not Chrome/27.0.1500.95 Mobile/10B141 Safari/537.36 Bowser/0.2.1",
+        "expect"  :
+        {
+            "name"    : "Bowser",
+            "version" : "0.2.1",
+            "major"   : "0"
+        }
+    },
    {
        "desc"    : "Camino",
        "ua"      : "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.4; en; rv:1.9.0.19) Gecko/2011091218 Camino/2.0.9 (like Firefox/3.0.19)",
@@ -129,6 +139,26 @@
            "major"   : "20"
        }
    },
+    {
+            "desc"    : "Chrome Headless",
+            "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome Safari/537.36",
+            "expect"  :
+        {
+           "name"    : "Chrome Headless",
+           "version" : "undefined",
+           "major"   : "undefined"
+        }
+    },
+    {
+            "desc"    : "Chrome Headless",
+            "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/60.0.3112.113 Safari/537.36",
+            "expect"  :
+        {
+           "name"    : "Chrome Headless",
+           "version" : "60.0.3112.113",
+           "major"   : "60"
+        }
+    },
    {
        "desc"    : "Chrome WebView",
        "ua"      : "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 5 Build/LMY48B; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.65 Mobile Safari/537.36",
@@ -210,13 +240,23 @@
        }
    },
    {
-        "desc"    : "Facebook in-App Browser",
+        "desc"    : "Facebook in-App Browser for Android",
        "ua"      : "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/35.0.0.48.273;]",
        "expect"  :
        {
-            "name"    : "Chrome WebView",
-            "version" : "43.0.2357.121",
-            "major"   : "43"
+            "name"    : "Facebook",
+            "version" : "35.0.0.48.273",
+            "major"   : "35"
+        }
+    },
+    {
+        "desc"    : "Facebook in-App Browser for iOS",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E304 [FBAN/FBIOS;FBAV/91.0.0.41.73;FBBV/57050710;FBDV/iPhone8,1;FBMD/iPhone;FBSN/iOS;FBSV/10.3.1;FBSS/2;FBCR/Telekom.de;FBID/phone;FBLC/de_DE;FBOP/5;FBRV/0])",
+        "expect"  :
+        {
+            "name"    : "Facebook",
+            "version" : "91.0.0.41.73",
+            "major"   : "91"
        }
    },
    {
@@ -519,6 +559,16 @@
            "major"   : "7"
        }
    },
+    {
+        "desc"    : "Oculus Browser",
+        "ua"      : "Mozilla/5.0 (Linux; Android 7.0; SM-G920I Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/3.4.9 SamsungBrowser/4.0 Chrome/57.0.2987.146 Mobile VR Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Oculus Browser",
+            "version" : "3.4.9",
+            "major"   : "3"
+        }
+    },
    {
        "desc"    : "OmniWeb",
        "ua"      : "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/85 (KHTML, like Gecko) OmniWeb/v558.48",
@@ -609,6 +659,16 @@
            "major"   : "11"
        }
    },
+    {
+        "desc"    : "Opera Coast",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_2 like Mac OS X; en) AppleWebKit/601.1.46 (KHTML, like Gecko) Coast/5.04.110603 Mobile/13F69 Safari/7534.48.3",
+        "expect"  :
+        {
+            "name"    : "Opera Coast",
+            "version" : "5.04.110603",
+            "major"   : "5"
+        }
+    },
    {
        "desc"    : "PhantomJS",
        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.2 Safari/534.34",
@@ -639,6 +699,16 @@
            "major"   : "6"
        }
    },
+    {
+        "desc"    : "QQ",
+        "ua"      : "Mozilla/5.0 (Linux; U; Android 4.4.4; zh-cn; OPPO R7s Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko)Version/4.0 Chrome/37.0.0.0 MQQBrowser/7.1 Mobile Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "QQBrowser",
+            "version" : "7.1",
+            "major"   : "7"
+        }
+    },
    {
        "desc"    : "RockMelt",
        "ua"      : "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.7 (KHTML, like Gecko) RockMelt/0.8.36.78 Chrome/7.0.517.44 Safari/534.7",
@@ -669,6 +739,16 @@
            "major"   : "2"
        }
    },
+    {
+        "desc"    : "Samsung Browser",
+        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG-SM-G925A Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Samsung Browser",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
    {
        "desc"    : "SeaMonkey",
        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b4pre) Gecko/20090405 SeaMonkey/2.0b1pre",
@@ -729,6 +809,26 @@
            "major"   : "1"
        }
    },
+    {
+        "desc"    : "UC Browser",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.99 UBrowser/5.6.12860.7 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "UCBrowser",
+            "version" : "5.6.12860.7",
+            "major"   : "5"
+        }
+    },
+    {
+        "desc"    : "UC Browser",
+        "ua"      : "Mozilla/5.0 (Linux; U; Android 6.0.1; en-US; Lenovo P2a42 Build/MMB29M) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 UCBrowser/11.2.0.915 U3/0.8.0 Mobile Safari/534.30",
+        "expect"  :
+        {
+            "name"    : "UCBrowser",
+            "version" : "11.2.0.915",
+            "major"   : "11"
+        }
+    },
    {
        "desc"    : "UC Browser on Samsung",
        "ua"      : "Mozilla/5.0 (Java; U; Pt-br; samsung-gt-s5620) UCBrowser8.2.1.144/69/352/UCWEB Mobile UNTRUSTED/1.0",
@@ -809,6 +909,16 @@
            "major"   : "1"
        }
    },
+    {
+        "desc"    : "Puffin",
+        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; Lenovo P2a42 Build/MMB29M; en-us) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Mobile Safari/537.36 Puffin/6.0.8.15804AP",
+        "expect"  :
+        {
+            "name"    : "Puffin",
+            "version" : "6.0.8.15804AP",
+            "major"   : "6"
+        }
+    },
    {
        "desc"    : "Microsoft Edge",
        "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",
@@ -838,5 +948,35 @@
            "version" : "1.1",
            "major"   : "1"
        }
+    },
+    {
+        "desc"    : "QQ on iOS",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Mobile/14A456 QQ/6.5.3.410 V1_IPH_SQ_6.5.3_1_APP_A Pixel/1080 Core/UIWebView NetType/WIFI Mem/26",
+        "expect"  :
+        {
+            "name"    : "QQ",
+            "version" : "6.5.3.410",
+            "major"   : "6"
+        }
+    },
+    {
+        "desc"    : "QQ on Android",
+        "ua"      : "Mozilla/5.0 (Linux; Android 6.0; PRO 6 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/37.0.0.0 Mobile MQQBrowser/6.8 TBS/036824 Safari/537.36 V1_AND_SQ_6.5.8_422_YYB_D PA QQ/6.5.8.2910 NetType/WIFI WebP/0.3.0 Pixel/1080",
+        "expect"  :
+        {
+            "name"    : "QQ",
+            "version" : "6.5.8.2910",
+            "major"   : "6"
+        }
+    },
+    {
+        "desc"    : "GSA on iOS",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) GSA/30.1.161623614 Mobile/14F89 Safari/602.1",
+        "expect"  :
+        {
+            "name"    : "GSA",
+            "version" : "30.1.161623614",
+            "major"   : "30"
+        }
    }
 ]
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -1,9 +1,7 @@
-[
-    {
+[{
        "desc": "Asus Nexus 7",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Nexus 7 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Asus",
            "model": "Nexus 7",
            "type": "tablet"
@@ -12,8 +10,7 @@
    {
        "desc": "Asus Padfone",
        "ua": "Mozilla/5.0 (Linux; Android 4.1.1; PadFone 2 Build/JRO03L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.117 Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Asus",
            "model": "PadFone",
            "type": "tablet"
@@ -22,8 +19,7 @@
    {
        "desc": "Desktop (IE11 with Tablet string)",
        "ua": "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; .NET4.0C; .NET CLR 3.5.30729; .NET CLR 2.0.50727; .NET CLR 3.0.30729; Tablet PC 2.0; GWX:MANAGED; rv:11.0) like Gecko",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "undefined",
            "model": "undefined",
            "type": "undefined"
@@ -32,8 +28,7 @@
    {
        "desc": "HTC Evo Shift 4G",
        "ua": "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "HTC",
            "model": "Evo Shift 4G",
            "type": "mobile"
@@ -42,28 +37,52 @@
    {
        "desc": "HTC Nexus 9",
        "ua": "Mozilla/5.0 (Linux; Android 5.0; Nexus 9 Build/LRX21R) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Mobile Crosswalk/7.36.154.13 Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "HTC",
            "model": "Nexus 9",
            "type": "tablet"
        }
    },
+    {
+        "desc": "Huawei Honor",
+        "ua": "Mozilla/5.0 (Linux; U; Android 2.3; xx-xx; U8860 Build/HuaweiU8860) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "U8860",
+            "type": "mobile"
+        }
+    },
    {
        "desc": "Huawei Nexus 6P",
        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 6P Build/MTC19V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Mobile Safari/537",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Huawei",
            "model": "Nexus 6P",
            "type": "mobile"
        }
    },
+    {
+        "desc": "Huawei P10",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; VTR-L09 Build/HUAWEIVTR-L09; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "VTR-L09",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Huawei Y3II",
+        "ua": "Mozilla/5.0 (Linux; U; Android 5.1; xx-xx; HUAWEI LUA-L03 Build/HUAWEILUA-L03) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "LUA-L03",
+            "type": "mobile"
+        }
+    },
    {
        "desc": "iPod",
        "ua": "Mozilla/5.0 (iPod touch; CPU iPhone OS 7_0_4 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B554a Safari/9537.53",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Apple",
            "model": "iPod touch",
            "type": "mobile"
@@ -72,8 +91,7 @@
    {
        "desc": "LG Nexus 4",
        "ua": "Mozilla/5.0 (Linux; Android 4.2.1; Nexus 4 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "LG",
            "model": "Nexus 4",
            "type": "mobile"
@@ -82,18 +100,25 @@
    {
        "desc": "LG Nexus 5",
        "ua": "Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 5 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "LG",
            "model": "Nexus 5",
            "type": "mobile"
        }
    },
+    {
+        "desc": "Meizu M5 Note",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0; M5 Note Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/53.0.2785.49 Mobile MQQBrowser/6.2 TBS/043024 Safari/537.36 MicroMessenger/6.5.7.1040 NetType/WIFI Language/zh_CN",
+        "expect": {
+            "vendor": "Meizu",
+            "model": "M5 Note",
+            "type": "tablet"
+        }
+    },
    {
        "desc": "Microsoft Lumia 950",
        "ua": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.10586",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Microsoft",
            "model": "Lumia 950",
            "type": "mobile"
@@ -102,8 +127,7 @@
    {
        "desc": "Motorola Moto X",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.4; XT1097 Build/KXE21.187-38) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Motorola",
            "model": "XT1097",
            "type": "mobile"
@@ -112,8 +136,7 @@
    {
        "desc": "Motorola Nexus 6",
        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.20 Mobile Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Motorola",
            "model": "Nexus 6",
            "type": "mobile"
@@ -122,8 +145,7 @@
    {
        "desc": "Motorola Droid RAZR 4G",
        "ua": "Mozilla/5.0 (Linux; U; Android 2.3; xx-xx; DROID RAZR 4G Build/6.5.1-73_DHD-11_M1-29) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Motorola",
            "model": "DROID RAZR 4G",
            "type": "mobile"
@@ -132,8 +154,7 @@
    {
        "desc": "iPhone",
        "ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Apple",
            "model": "iPhone",
            "type": "mobile"
@@ -142,8 +163,7 @@
    {
        "desc": "Motorola Droid RAZR 4G",
        "ua": "Mozilla/5.0 (iPod touch; CPU iPhone OS 7_0_2 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A501 Safari/9537.53",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Apple",
            "model": "iPod touch",
            "type": "mobile"
@@ -152,8 +172,7 @@
    {
        "desc": "Moto X",
        "ua": "Mozilla/5.0 (Linux; U; Android 4.2; xx-xx; XT1058 Build/13.9.0Q2.X-70-GHOST-ATT_LE-2) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Motorola",
            "model": "XT1058",
            "type": "mobile"
@@ -162,8 +181,7 @@
    {
        "desc": "Nokia3xx",
        "ua": "Nokia303/14.87 CLDC-1.1",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Nokia",
            "model": "303",
            "type": "mobile"
@@ -172,18 +190,25 @@
    {
        "desc": "OnePlus One",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.4; A0001 Build/KTU84Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "OnePlus",
            "model": "1",
            "type": "mobile"
        }
    },
+    {
+        "desc": "OPPO R7s",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.4.4; zh-cn; OPPO R7s Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko)Version/4.0 Chrome/37.0.0.0 MQQBrowser/7.1 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "OPPO",
+            "model": "R7s",
+            "type": "mobile"
+        }
+    },
    {
        "desc": "Philips SmartTV",
        "ua": "Opera/9.80 HbbTV/1.1.1 (; Philips; ; ; ; ) NETTV/4.0.2; en) Version/11.60",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Philips",
            "model": "",
            "type": "smarttv"
@@ -192,8 +217,7 @@
    {
        "desc": "Kindle Fire HD",
        "ua": "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFTT Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.4 Mobile Safari/535.19 Silk-Accelerated=true",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Amazon",
            "model": "KFTT",
            "type": "tablet"
@@ -202,18 +226,25 @@
    {
        "desc": "Samsung Galaxy Note 8",
        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; GT-N5100 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.141 Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "GT-N5100",
            "type": "tablet"
        }
    },
+    {
+        "desc": "Samsung SM-C5000",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; SM-C5000 Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/51.0.2704.81 Mobile Safari/537.36 wkbrowser 4.1.35 3065",
+        "expect": {
+            "vendor": "Samsung",
+            "model": "SM-C5000",
+            "type": "mobile"
+        }
+    },
    {
        "desc": "Samsung SM-T231",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; SM-T231 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SM-T231",
            "type": "tablet"
@@ -222,8 +253,7 @@
    {
        "desc": "Samsung SM-T700",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; SM-T700 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SM-T700",
            "type": "tablet"
@@ -232,8 +262,7 @@
    {
        "desc": "Samsung SM-T520",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; SM-T520 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SM-T520",
            "type": "tablet"
@@ -242,8 +271,7 @@
    {
        "desc": "Samsung SmartTV2011",
        "ua": "HbbTV/1.1.1 (;;;;;) Maple;2011",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SmartTV2011",
            "type": "smarttv"
@@ -252,8 +280,7 @@
    {
        "desc": "Samsung SmartTV2012",
        "ua": "HbbTV/1.1.1 (;Samsung;SmartTV2012;;;) WebKit",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SmartTV2012",
            "type": "smarttv"
@@ -262,8 +289,7 @@
    {
        "desc": "Samsung SmartTV2014",
        "ua": "HbbTV/1.1.1 (;Samsung;SmartTV2014;T-NT14UDEUC-1060.4;;) WebKit",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SmartTV2014",
            "type": "smarttv"
@@ -272,8 +298,7 @@
    {
        "desc": "Samsung SmartTV",
        "ua": "Mozilla/5.0 (SMART-TV; Linux; Tizen 2.3) AppleWebkit/538.1 (KHTML, like Gecko) SamsungBrowser/1.0 TV Safari/538.1",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "undefined",
            "type": "smarttv"
@@ -282,58 +307,52 @@
    {
        "desc": "Sony C5303 (Xperia SP)",
        "ua": "Mozilla/5.0 (Linux; Android 4.3; C5303 Build/12.1.A.1.205) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.93 Mobile Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Sony",
-            "model"   : "Xperia Phone",
+            "model": "C5303",
            "type": "mobile"
        }
    },
    {
        "desc": "Sony SO-02F (Xperia Z1 F)",
        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; SO-02F Build/14.1.H.2.119) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Sony",
-            "model"   : "Xperia Phone",
+            "model": "SO-02F",
            "type": "mobile"
        }
    },
    {
        "desc": "Sony D6653 (Xperia Z3)",
        "ua": "Mozilla/5.0 (Linux; Android 4.4; D6653 Build/23.0.A.0.376) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.141 Mobile Safari/537.36",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Sony",
-            "model"   : "Xperia Phone",
+            "model": "D6653",
            "type": "mobile"
        }
    },
    {
        "desc": "Sony Xperia SOL25 (ZL2)",
        "ua": "Mozilla/5.0 (Linux; U; Android 4.4; SOL25 Build/17.1.1.C.1.64) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Sony",
-            "model"   : "Xperia Phone",
+            "model": "SOL25",
            "type": "mobile"
        }
    },
    {
        "desc": "Sony Xperia SP",
        "ua": "Mozilla/5.0 (Linux; Android 4.3; C5302 Build/12.1.A.1.201) AppleWebkit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Sony",
-            "model"   : "Xperia Phone",
+            "model": "C5302",
            "type": "mobile"
        }
    },
    {
        "desc": "Sony SGP521 (Xperia Z2 Tablet)",
        "ua": "Mozilla/5.0 (Linux; Android 4.4; SGP521 Build/17.1.A.0.432) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Safari/537.36",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Sony",
            "model": "Xperia Tablet",
            "type": "tablet"
@@ -342,8 +361,7 @@
    {
        "desc": "Sony Tablet S",
        "ua": "Mozilla/5.0 (Linux; U; Android 3.1; Sony Tablet S Build/THMAS10000) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Sony",
            "model": "Xperia Tablet",
            "type": "tablet"
@@ -352,8 +370,7 @@
    {
        "desc": "Sony Tablet Z LTE",
        "ua": "Mozilla/5.0 (Linux; U; Android 4.1; SonySGP321 Build/10.2.C.0.143) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Sony",
            "model": "Xperia Tablet",
            "type": "tablet"
@@ -362,8 +379,7 @@
    {
        "desc": "Xiaomi 2013023",
        "ua": "Mozilla/5.0 (Linux; U; Android 4.2.2; en-US; 2013023 Build/HM2013023) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/10.0.1.512 U3/0.8.0 Mobile Safari/533.1",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Xiaomi",
            "model": "2013023",
            "type": "mobile"
@@ -372,8 +388,7 @@
    {
        "desc": "Xiaomi Hongmi Note 1W",
        "ua": "Mozilla/5.0 (Linux; U; Android 4.2.2; zh-CN; HM NOTE 1W Build/JDQ39) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.7.9.439 U3/0.8.0 Mobile Safari/533.1",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Xiaomi",
            "model": "HM NOTE 1W",
            "type": "mobile"
@@ -382,8 +397,7 @@
    {
        "desc": "Xiaomi Mi 3C",
        "ua": "Mozilla/5.0 (Linux; U; Android 4.3; zh-CN; MI 3C Build/JLS36C) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.7.9.439 U3/0.8.0 Mobile Safari/533.1",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Xiaomi",
            "model": "MI 3C",
            "type": "mobile"
@@ -392,8 +406,7 @@
    {
        "desc": "Xiaomi Mi Note",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.4; MI NOTE LTE Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Xiaomi",
            "model": "MI NOTE LTE",
            "type": "mobile"
@@ -402,8 +415,7 @@
    {
        "desc": "Xiaomi Mi One Plus",
        "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; MI-ONE Plus Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Xiaomi",
            "model": "MI-ONE Plus",
            "type": "mobile"
@@ -412,8 +424,7 @@
    {
        "desc": "PlayStation 4",
        "ua": "Mozilla/5.0 (PlayStation 4 3.00) AppleWebKit/537.73 (KHTML, like Gecko)",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Sony",
            "model": "PlayStation 4",
            "type": "console"
@@ -422,8 +433,7 @@
    {
        "desc": "Galaxy Nexus",
        "ua": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "Galaxy Nexus",
            "type": "mobile"
@@ -432,8 +442,7 @@
    {
        "desc": "Samsung Galaxy S5",
        "ua": "Mozilla/5.0 (Linux; Android 5.0; SM-G900F Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.78 Mobile Safari/537.36",
-        "expect"    :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SM-G900F",
            "type": "mobile"
@@ -442,8 +451,7 @@
    {
        "desc": "Samsung Galaxy S6",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; SM-G920I Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SM-G920I",
            "type": "mobile"
@@ -452,8 +460,7 @@
    {
        "desc": "Samsung Galaxy S6 Edge",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; SM-G925I Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SM-G925I",
            "type": "mobile"
@@ -462,22 +469,351 @@
    {
        "desc": "Samsung Galaxy Note 5 Chrome",
        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; SM-N920C Build/LMY47X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.91 Mobile Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SM-N920C",
            "type": "mobile"
        }
-    }
-,
+    },
    {
        "desc": "Samsung Galaxy Note 5 Samsung Browser",
        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; SAMSUNG SM-N920C Build/LMY47X) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile Safari/537.36",
-        "expect"  :
-        {
+        "expect": {
            "vendor": "Samsung",
            "model": "SM-N920C",
            "type": "mobile"
        }
+    },
+    {
+        "desc": "Google Chromecast",
+        "ua": "Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.22.79313",
+        "expect": {
+            "vendor": "Google",
+            "model": "Chromecast"
+        }
+    },
+    {
+        "desc": "Google Pixel C",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; Pixel C Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/52.0.2743.98 Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel C",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Google Pixel",
+        "ua": "Mozilla/5.0 (Linux; Android 7.1; Pixel Build/NDE63V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Google Pixel",
+        "ua": "Mozilla/5.0 (Linux; Android 7.1; Pixel XL Build/NDE63X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.85 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel XL",
+            "type": "mobile"
+        }
+    },
+
+    {
+        "desc": "Generic Android Device",
+        "ua": "Mozilla/5.0  (Linux; U; Android 6.0.1; i980 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "Generic",
+            "model": "Android 6.0.1"
+        }
+    },
+    {
+        "desc": "LG VK Series Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 5.0.2; VK700 Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.84 Safari/537.36",
+        "expect": {
+            "vendor": "LG",
+            "model": "VK700",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "LG LK Series Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 5.0.1; LGLK430 Build/LRX21Y) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/38.0.2125.102 Safari/537.36",
+        "expect": {
+            "vendor": "LG",
+            "model": "LK430",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "RCA Voyager III Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; RCT6973W43 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "RCA",
+            "model": "RCT6973W43",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "RCA Voyager II Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 5.0; RCT6773W22B Build/LRX21M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "RCA",
+            "model": "RCT6773W22B",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Verizon Quanta Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; QMV7B Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "Verizon",
+            "model": "QMV7B",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Verizon Ellipsis 8 Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; QTAQZ3 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "Verizon",
+            "model": "QTAQZ3",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Verizon Ellipsis 8HD Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; QTASUN1 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Safari/537.36",
+        "expect": {
+            "vendor": "Verizon",
+            "model": "QTASUN1",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Dell Venue 8 Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Venue 8 3830 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "Dell",
+            "model": "Venue 8 3830",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Dell Venue 7 Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Venue 7 3730 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "Dell",
+            "model": "Venue 7 3730",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Barnes & Noble Nook HD+ Tablet",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; Barnes & Noble Nook HD+ Build/JZO54K; CyanogenMod-10) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+        "expect": {
+            "vendor": "Barnes & Noble",
+            "model": "Nook HD+",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Barnes & Noble V400 Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 4.0.4; BNTV400 Build/IMM76L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Safari/537.36",
+        "expect": {
+            "vendor": "Barnes & Noble",
+            "model": "V400",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "NuVision TM101A540N Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1; TM101A540N Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/50.0.2661.86 Safari/537.36",
+        "expect": {
+            "vendor": "NuVision",
+            "model": "TM101A540N",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "ZTE K Series Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; K88 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "ZTE",
+            "model": "K88",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Swizz GEN610",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; GEN610 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Swiss",
+            "model": "GEN610",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Swizz ZUR700",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; ZUR700 Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.96 Safari/537.36",
+        "expect": {
+            "vendor": "Swiss",
+            "model": "ZUR700",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Zeki TB782b Tablet",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; en-US; TB782B Build/IMM76D) AppleWebKit/534.31 (KHTML, like Gecko) UCBrowser/9.0.2.299 U3/0.8.0 Mobile Safari/534.31",
+        "expect": {
+            "vendor": "Zeki",
+            "model": "TB782B",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Dragon Touch Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 4.0.4; DT9138B Build/IMM76D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Dragon Touch",
+            "model": "9138B",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Insignia Tablet",
+        "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; NS-P08A7100 Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "Insignia",
+            "model": "NS-P08A7100",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Voice Xtreme V75",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.2.1; en-us; V75 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+        "expect": {
+            "vendor": "Voice",
+            "model": "V75",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "LvTel V11",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; V11 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Safari/537.36",
+        "expect": {
+            "vendor": "LvTel",
+            "model": "V11",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Envizen Tablet V100MD",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; V100MD Build/V100MD.20130816) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
+        "expect": {
+            "vendor": "Envizen",
+            "model": "V100MD",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Rotor Tablet",
+        "ua": "mozilla/5.0 (linux; android 5.0.1; tu_1491 build/lrx22c) applewebkit/537.36 (khtml, like gecko) chrome/43.0.2357.93 safari/537.36",
+        "expect": {
+            "vendor": "Rotor",
+            "model": "1491",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "MachSpeed Tablets",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Trio 7.85 vQ Build/Trio_7.85_vQ) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36",
+        "expect": {
+            "vendor": "MachSpeed",
+            "model": "Trio 7.85 vQ",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Trinity Tablets",
+        "ua": "Mozilla/5.0 (Linux; Android 5.0.1; Trinity T101 Build/LRX22C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Safari/537.36",
+        "expect": {
+            "vendor": "Trinity",
+            "model": "T101",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "NextBook Next7",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Next7P12 Build/IMM76I) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
+        "expect": {
+            "vendor": "NextBook",
+            "model": "Next7P12",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "NextBook Tablets",
+        "ua": "Mozilla/5.0 (Linux; Android 5.0; NXA8QC116 Build/LRX21V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "NextBook",
+            "model": "NXA8QC116",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Le Pan Tablets",
+        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Le Pan TC802A Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "Le Pan",
+            "model": "TC802A",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Le Pan Tablets",
+        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Le Pan TC802A Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "Le Pan",
+            "model": "TC802A",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Amazon Kindle Fire Tablet",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.4.3; en-us; KFSAWI Build/KTU84M) AppleWebKit/537.36 (KHTML, like Gecko) Silk/3.66 like Chrome/39.0.2171.93 Safari/537.36",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "KFSAWI",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Gigaset Tablet",
+        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Gigaset QV830 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "expect": {
+            "vendor": "Gigaset",
+            "model": "QV830",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Redmi Note 3",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; Redmi Note 3 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.116 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Redmi Note 3",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "MI PAD 2",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1; MI PAD 2 Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/60.0.3112.107 Safari/537.36 [FB_IAB/FB4A;FBAV/137.0.0.24.91;]",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "MI PAD 2",
+            "type": "tablet"
+        }
    }
 ]
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -485,6 +485,15 @@
            "version" : ""
        }
    },
+    {
+        "desc"    : "iOS in App",
+        "ua"      : "AppName/version CFNetwork/version Darwin/version",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "undefined"
+        }
+    },
    {
        "desc"    : "iOS with Chrome",
        "ua"      : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",
--- a/test/test.js
+++ b/test/test.js
@@ -65,13 +65,35 @@ for (var i in methods) {
    });
 }

+describe('Returns', function () {
+    it('getResult() should returns JSON', function(done) {
+        assert.deepEqual(new UAParser('').getResult(), 
+            {
+                ua : '',
+                browser: { name: undefined, version: undefined, major: undefined },
+                cpu: { architecture: undefined },
+                device: { vendor: undefined, model: undefined, type: undefined },
+                engine: { name: undefined, version: undefined},
+                os: { name: undefined, version: undefined }
+        });
+        done();
+    });
+});
+
 describe('Extending Regex', function () {
    var uaString = 'Mozilla/5.0 MyOwnBrowser/1.3';
    var myOwnBrowser = [[/(myownbrowser)\/((\d+)?[\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION, UAParser.BROWSER.MAJOR]];
-    var parser = new UAParser(uaString, {browser: myOwnBrowser});
-    assert.equal(parser.getBrowser().name, 'MyOwnBrowser');
-    assert.equal(parser.getBrowser().version, '1.3');
-    assert.equal(parser.getBrowser().major, '1');
+
+    var parser1 = new UAParser(uaString, {browser: myOwnBrowser});
+    assert.equal(parser1.getBrowser().name, 'MyOwnBrowser');
+    assert.equal(parser1.getBrowser().version, '1.3');
+    assert.equal(parser1.getBrowser().major, '1');
+
+    var parser2 = new UAParser({browser: myOwnBrowser});
+    assert.equal(parser2.getBrowser().name, undefined);
+    parser2.setUA(uaString);
+    assert.equal(parser2.getBrowser().name, 'MyOwnBrowser');
+    assert.equal(parser1.getBrowser().version, '1.3');
 });

 describe('Using Require.js', function () {
--- a/ua-parser-js.jquery.json
+++ b/ua-parser-js.jquery.json
@@ -1,32 +0,0 @@
-{
-  "title": "UAParser.js",
-  "name": "ua-parser-js",
-  "version": "0.7.12",
-  "description": "Lightweight JavaScript-based user-agent string parser",
-  "keywords": [
-    "user-agent",
-    "parser",
-    "browser",
-    "engine",
-    "os",
-    "device",
-    "cpu"
-  ],
-  "homepage": "https://faisalman.github.com/ua-parser-js",
-  "author": {
-    "name": "Faisal Salman",
-    "email": "fyzlman@gmail.com"
-  },
-  "dependencies": {
-    "jquery": ">=1.5"
-  },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/mit-license.php"
-    }
-  ],
-  "bugs": "https://github.com/faisalman/ua-parser-js/issues",
-  "docs": "https://github.com/faisalman/ua-parser-js",
-  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.min.js"
-}
Author	SHA1	Message	Date
Faisal Salman	6095258673	Fix #268 revert changes	2017-10-12 15:16:23 +07:00
Faisal Salman	40aa1a693b	bump version	2017-10-12 12:10:08 +07:00
Faisal Salman	25e143ee7c	Fix vulnerable regex in getOS() (as reported by Nick Starke)	2017-10-12 12:07:10 +07:00
Faisal Salman	7bd9ffea24	Fix #262 Chrome Headless	2017-10-12 09:48:25 +07:00
Faisal Salman	c566f45cbd	Merge branch 'master' into develop	2017-10-12 09:39:37 +07:00
Faisal Salman	3b89dff771	increment revision 0.7.15	2017-10-12 09:28:14 +07:00
Faisal Salman	5ba5e7abc9	Merge branch 'develop' of github.com:faisalman/ua-parser-js into develop	2017-10-12 09:19:03 +07:00
Faisal Salman	b8978f5933	Fix #262 Chrome Headless	2017-10-12 09:18:42 +07:00
Faisal Salman	eeb1b9ef81	Merge pull request #265 from brophdawg11/support-ios-gsa Add support for Google Search Appliance on iOS	2017-10-11 21:35:06 +07:00
Faisal Salman	aeae29be66	Merge pull request #267 from LukasDrgon/patch-1 Add CDN link	2017-10-11 20:48:39 +07:00
Lukas Drgon	3ce12c0cf9	Add CDN link	2017-10-02 19:31:03 +02:00
Matt Brophy	4d95ac10ef	Add support for Google Search Appliance on iOS	2017-09-19 14:19:32 -04:00
Faisal Salman	61b4a089c5	Merge pull request #264 from arunrreddy/support-device-redmi Support device redmi	2017-09-17 06:02:39 +07:00
Arun Rama Reddy	74ec93ffb6	feat: Added Redmi phone and Mi Pad tablet detection support	2017-09-16 11:12:29 +05:30
Faisal Salman	459f3d34f5	Issue #258 0.7.15rc	2017-08-06 08:27:02 +07:00
Faisal Salman	6f621f1ae2	New feature: CLI support	2017-08-06 07:55:22 +07:00
Faisal Salman	7ae3098778	Fix #256 tag new release 0.7.14	2017-07-19 19:39:01 +07:00
Faisal Salman	806c2b8030	move jquery.json to package.json	2017-07-19 19:35:42 +07:00
Faisal Salman	cb1a64b509	Merge some commits from branch 'develop'	2017-07-17 23:14:19 +07:00
Faisal Salman	b49cfae4e2	Opening donation	2017-07-17 22:54:45 +07:00
Faisal Salman	91b046462c	Merge branch 'master' of github.com:faisalman/ua-parser-js	2017-07-17 22:51:38 +07:00
Faisal Salman	69509af6dd	Merge pull request #254 from hr6r/develop + browser inside QQ support	2017-07-05 19:01:27 +07:00
Faisal Salman	225f703b67	Merge pull request #231 from motnik/develop Added Multiple Tablets Detection (LG, RCA, Dell, Verizon, etc.)	2017-07-05 19:00:02 +07:00
dianhe	7f217753f5	+ browser inside QQ support	2017-07-05 19:55:19 +08:00
Faisal Salman	10f9fb35ca	Merge pull request #234 from Kronuz/patch-1 Fix server side rendering	2017-07-05 18:38:48 +07:00
Faisal Salman	5ae468a3d3	uastring is optional when using extensions	2017-07-01 20:28:03 +07:00
Faisal Salman	fd46c4d2be	Fix #249 Detect Huawei devices	2017-07-01 18:49:35 +07:00
Faisal Salman	297c6538bc	Fix #206 Detect OS for iOS app	2017-06-28 16:12:43 +07:00
Faisal Salman	f9f9fa79e1	Fix #247 Add Oculus Browser	2017-06-28 15:57:50 +07:00
Faisal Salman	07fe58b793	Fix #220 Identify UBrowser as UCBrowser	2017-06-28 14:54:39 +07:00
Faisal Salman	3a4626b5e8	Fix #211 Distinguish Samsung Browser from Android Browser	2017-06-28 14:20:05 +07:00
Faisal Salman	3fd01f07ea	Fix #235 Detect Meizu Tablet	2017-06-22 17:37:35 +07:00
Faisal Salman	d103dd5450	Fix #219 samsung mistakenly detected as sony	2017-06-22 17:04:14 +07:00
Faisal Salman	6cc6742f5e	increment patch version	2017-06-22 14:20:01 +07:00
Faisal Salman	cf977c50ed	remove component.json	2017-06-22 14:11:17 +07:00
Faisal Salman	4c15b10730	revert readme.md fix	2017-06-03 02:28:55 +07:00
Faisal Salman	a3c7619d3a	fix readme.md conflict	2017-06-03 01:08:20 +07:00
Faisal Salman	82aba654f9	Merge pull request #242 from ebbmo/feature/recognize_facebook_browser_for_android Facebook browser now recognized as well (not only iOS)	2017-05-23 14:55:27 +07:00
Hermann Ebert	2f1b14906f	Facebook browser now recognized as well (not only iOS)	2017-05-23 09:06:58 +02:00
Faisal Salman	a3a09d33bc	Merge pull request #236 from ronkorland/master Add support for Chrome Headless user agent	2017-05-17 09:49:29 +07:00
Faisal Salman	946ba02c54	Merge pull request #228 from arturom/develop Added Google Chromemast detection	2017-05-15 00:38:11 +07:00
Faisal Salman	d2d570fcd5	Merge pull request #233 from vladimyr/develop Adding Opera Coast support, fixing UCBrowser detection	2017-05-15 00:33:38 +07:00
Faisal Salman	18e08428f4	Merge pull request #216 from ericschrenker/0readme Copyedit Readme File	2017-04-26 11:15:28 +07:00
Ron Korland	552915907e	Add support to Chrome Headless user agent	2017-04-13 16:42:04 +03:00
Germán M. Bravo	6984de7927	Fix server side rendering Fixes problem when window is undefined in the server.	2017-03-30 16:13:41 -06:00
Dario Vladovic	7a68f35574	Adding support for Puffin browser	2017-03-21 18:41:51 +01:00
Dario Vladovic	2bc75f10bc	Adding Opera Coast support, fixing UCBrowser detection - pushing UCBrowser up to avoid being caught by Chrome regex - adding regex for Opera Coast (Opera's iOS browser)	2017-03-21 18:09:15 +01:00
Nikhil Motiani	2610f37a8b	Added Gigaset Tablet detection	2017-03-16 20:39:21 +05:30
Nikhil Motiani	a25bb8b1a6	Added Amazon Kindle Fire Tablet detection	2017-03-16 20:35:11 +05:30
Nikhil Motiani	ee2db31f8c	Added Le-Pan Tablet detection	2017-03-16 20:27:04 +05:30
Nikhil Motiani	89775a8ae7	Added NextBook Tablet detection	2017-03-16 20:19:14 +05:30
Nikhil Motiani	7d826ed62e	Improved Unidentified Tablet detection	2017-03-16 20:09:22 +05:30
Nikhil Motiani	a6316f02b0	Added Trinity Tablets detection	2017-03-16 20:06:33 +05:30
Nikhil Motiani	72a11e24b2	Added MachSpeed Tablets detection	2017-03-16 20:00:42 +05:30
Nikhil Motiani	f7ca724f3b	Added Rotor Tablets detection	2017-03-16 19:56:40 +05:30
Nikhil Motiani	8d826fcc24	Added Envizen Tablets detection	2017-03-16 19:51:44 +05:30
Nikhil Motiani	951106c425	Added LvTel Phones detection	2017-03-16 19:44:21 +05:30
Nikhil Motiani	83ca52bb28	Added Voice Xtreme Phones detection	2017-03-16 19:43:50 +05:30
Nikhil Motiani	6fb4941458	Added Insignia Tablets detection	2017-03-16 15:48:22 +05:30
Nikhil Motiani	48ab3b372c	Added Dragon-Touch Tablets detection	2017-03-16 15:45:39 +05:30
Nikhil Motiani	38c409e8d9	Added Zeki Tablets detection	2017-03-16 15:27:35 +05:30
Nikhil Motiani	4e2cbdfd16	Added Swiss Mobiles and Tablets detection	2017-03-16 15:19:22 +05:30
Nikhil Motiani	fbe8a0e3a6	Added Generic Android detection	2017-03-16 15:09:01 +05:30
Nikhil Motiani	8e9c400ec5	Added ZTE K-Series Tablet detection	2017-03-16 15:07:22 +05:30
Nikhil Motiani	b89fa098aa	Added NuVision Tablet detection	2017-03-16 15:04:02 +05:30
Nikhil Motiani	f3882f1882	Added Barnes & Noble Tablet detection	2017-03-16 15:03:04 +05:30
Nikhil Motiani	a25426840c	Added Dell Venue Tablet detection	2017-03-16 15:01:49 +05:30
Nikhil Motiani	985a7b18e0	Added Verizon Devices detection	2017-03-16 15:00:00 +05:30
Nikhil Motiani	8e09cd49e3	Added RCA Devices detection	2017-03-16 14:57:28 +05:30
Nikhil Motiani	4768992762	Added LG Generic Mobile	2017-03-16 14:54:40 +05:30
Nikhil Motiani	f89e08f2c0	Improved LG Tablet Detection	2017-03-16 14:47:11 +05:30
Arturo Mejia	fe568ffe96	Added Google Chromemast detection	2017-03-08 12:55:35 -05:00
Eric Schrenker	252db2534e	📝 copyedit readme	2017-01-17 14:43:09 -06:00
Faisal Salman	6555bf6e81	Fix #210 Refine browser: QQBrowser	2016-12-27 16:36:51 +07:00
Faisal Salman	740fc93b4b	Fix #210 Add device: OPPO	2016-12-27 15:58:58 +07:00
Faisal Salman	eed646f9ce	Add Bowser	2016-12-22 23:50:01 +07:00
Faisal Salman	764de40fe0	Merge pull request #205 from piperchester/patch-1 Fix formatting for consistency	2016-12-07 14:35:43 +07:00
Piper Chester	49609c0990	Fix formatting for consistency	2016-12-06 22:16:25 -08:00
Faisal Salman	ef69224d7c	Edit readme	2016-12-06 13:47:30 +07:00
Faisal Salman	caa2f47c06	update uglify version	2016-12-06 12:44:16 +07:00
Faisal Salman	5177c460a5	Use constructors	2016-12-06 12:41:48 +07:00
Faisal Salman	3e2d5c1817	Update contributors	2016-11-22 14:03:54 +07:00
Faisal Salman	29a0372611	Merge branch 'master' into develop	2016-11-22 00:52:24 +07:00
Faisal Salman	2aa2f77881	Fix #186 unnecessary `if` statement inside `while` loop	2016-11-22 00:49:18 +07:00
Faisal Salman	1e228b2fbe	Merge pull request #201 from roberttod/google-pixel Add google pixel devices	2016-11-18 14:50:13 +07:00
Robert Tod	5379ec8513	Add google pixel devices - Add Google Pixel and Google Pixel XL mobiles - Add Google Pixel C tablet	2016-11-17 13:36:08 -05:00