Add a test for issue #8

2025-11-21 01:26:40 +03:00 · 2013-01-25 20:23:43 +07:00
19 changed files with 1823 additions and 3378 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,2 @@
 node_modules/
 npm-debug.log
-<<<<<<< HEAD
-### vim ###
-.*.s[a-w][a-z]
-*.un~
-Session.vim
-.netrwhist
-*~
-
-### OSX ###
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear on external disk
-.Spotlight-V100
-.Trashes
-=======
-.idea
->>>>>>> baf4bb99b4ef92c71419931e8fd334e34c051e52
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,6 @@ node_js:
  - 0.8
  - 0.6
 notifications:
-  email: false
+  email:
+    on_success: never
+    on_failure: always
--- a/bower.json
+++ b/bower.json
@@ -1,39 +0,0 @@
-{
-    "name": "ua-parser-js",
-    "version": "0.7.0",
-    "authors": [
-        "Faisal Salman <fyzlman@gmail.com>"
-    ],
-    "private": false,
-    "main": "src/ua-parser.js",
-    "ignore": [
-        "build",
-        "node_modules",
-        "bower_components",
-        "test",
-        "tests"
-    ],
-    "contributors": [
-        "Faisal Salman <fyzlman@gmail.com>",
-        "Benjamin Bertrand <bertrand.design@gmail.com>",
-        "Christopher De Cairos <chris.decairos@gmail.com>",
-        "Davit Barbakadze <jayarjo@gmail.com>",
-        "Dmitry Tyschenko <dtyschenko@gmail.com>",
-        "Douglas Li <doug@knotch.it>",
-        "Erik Hesselink <hesselink@gmail.com>",
-        "Fabian Becker <halfdan@xnorfz.de>",
-        "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>",
-        "Lee Treveil <leetreveil@gmail.com>",
-        "Leonardo <leofiore@libero.it>",
-        "Michael Hess <mhess@connectify.me>",
-        "Ross Noble <rosshnoble@gmail.com>",
-        "Sandro Sonntag <sandro.sonntag@adorsys.de>"
-    ],
-    "dependencies": {
-
-    }
-}
--- a/build/build.sh
+++ b/build/build.sh
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# dependencies
-JSHINT_DIR="node_modules/jshint/bin/jshint"
-MOCHA_DIR="node_modules/mocha/bin/mocha"
-UGLIFY_DIR="node_modules/uglify-js/bin/uglifyjs"
-
-# check module directory & install if not found
-function check_module {
-    if ! type $2 &> /dev/null
-    then        
-        echo "$2 is not found"
-        if ! type "npm" &> /dev/null
-        then
-            echo "npm is not installed"
-            echo "Exiting"
-            exit 1
-        else
-            echo "Installing $1..."
-            npm install $1
-        fi
-    fi
-}
-
-check_module "jshint" $JSHINT_DIR
-check_module "mocha" $MOCHA_DIR
-check_module "uglify-js" $UGLIFY_DIR
-
-echo "Verifiying code..."
-$JSHINT_DIR src/ua-parser.js
-
-echo "Running test..."
-$MOCHA_DIR -R nyan test/test.js
-
-echo "Minifying script..."
-$UGLIFY_DIR src/ua-parser.js > src/ua-parser.min.js
-echo "OK"
--- a/component.json
+++ b/component.json
@@ -1,14 +0,0 @@
-{
-  "name": "ua-parser-js",
-  "version": "0.7.0",
-  "description": "Lightweight JavaScript-based user-agent string parser",
-  "keywords": ["user-agent", "parser", "browser", "engine", "os", "device", "cpu"],
-  "scripts": ["src/ua-parser.js"],
-  "main": "src/ua-parser.js",
-  "license": "MIT",
-  "development": {
-    "jshint/jshint": "*",
-    "visionmedia/mocha": "*",
-    "mishoo/uglifyjs2": "*"
-  }
-}
--- a/package.json
+++ b/package.json
@@ -1,49 +1,38 @@
 {
-  "title": "UAParser.js",
+  "title": "UA-Parser.JS",
  "name": "ua-parser-js",
-  "version": "0.7.0",
+  "version": "0.5.0",
  "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
  "description": "Lightweight JavaScript-based user-agent string parser",
  "keywords": [
-    "user-agent",
+    "user agent",
    "parser",
    "browser",
    "engine",
    "os",
-    "device",
-    "cpu"
+    "device"
  ],
  "homepage": "http://github.com/faisalman/ua-parser-js",
  "contributors": [
-    "Faisal Salman <fyzlman@gmail.com>",
-    "Benjamin Bertrand <bertrand.design@gmail.com>",
-    "Christopher De Cairos <chris.decairos@gmail.com>",
-    "Davit Barbakadze <jayarjo@gmail.com>",
-    "Dmitry Tyschenko <dtyschenko@gmail.com>",
-    "Douglas Li <doug@knotch.it>",
-    "Erik Hesselink <hesselink@gmail.com>",
-    "Fabian Becker <halfdan@xnorfz.de>",
-    "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>",
-    "Lee Treveil <leetreveil@gmail.com>",
-    "Leonardo <leofiore@libero.it>",
-    "Michael Hess <mhess@connectify.me>",
-    "Ross Noble <rosshnoble@gmail.com>",
-    "Sandro Sonntag <sandro.sonntag@adorsys.de>"
+    "Faisal Salman <fyzlman@gmail.com>"
  ],
-  "main": "src/ua-parser.js",
+  "main": "ua-parser",
  "scripts": {
-    "test": "./build/build.sh"
+    "test": "./node_modules/mocha/bin/mocha -R spec",
+    "pretest": "./node_modules/uglify-js/bin/uglifyjs ua-parser.js > ua-parser.min.js"
  },
  "devDependencies": {
-    "jshint": "~1.1.0",
-    "mocha": "~1.7.1",
-    "uglify-js": "~1.3.4"
+    "mocha": ">= 1.7.1",
+    "uglify-js": ">= 1.3.4"
  },
-  "repository" : {
+  "repositories": [
+    {
+      "type": "git",
+      "url": "https://github.com/faisalman/ua-parser-js.git"
+    }
+  ],
+  "repository" :
+  {
    "type": "git",
    "url": "https://github.com/faisalman/ua-parser-js.git"
  },
@@ -61,7 +50,10 @@
    "node": "*"
  },
  "directories": {
-    "lib": "src",
-    "test": "test"
-  }
+    "lib": "."
+  },
+  "files": [
+    ""
+  ],
+  "repository": "git://github.com/faisalman/ua-parser-js.git"
 }
--- a/readme.md
+++ b/readme.md
@@ -1,111 +1,43 @@
-# UAParser.js
+# UA-Parser.JS

-Lightweight JavaScript-based User-Agent string parser. Supports browser & node.js environment. Also available as Component package, Bower package, jQuery.ua, & AMD module
+Lightweight JavaScript-based User-Agent string parser

-[![Build Status](https://travis-ci.org/faisalman/ua-parser-js.png?branch=master)](https://travis-ci.org/faisalman/ua-parser-js)
+[![Build Status](https://travis-ci.org/faisalman/ua-parser-js.png)](https://travis-ci.org/faisalman/ua-parser-js)

 * Author    : Faisalman <<fyzlman@gmail.com>>
-* Demo      : http://faisalman.github.com/ua-parser-js
+* Home      : http://faisalman.github.com/ua-parser-js
 * Source    : https://github.com/faisalman/ua-parser-js
+* License   : GPLv2 & MIT

 ## Features

-Extract detailed type of web browser, layout engine, operating system, cpu architecture, and device purely from user-agent string with relatively lightweight footprint (~7KB minified / ~3KB gzipped). Written in vanilla js, which means it doesn't depends on any other library.
+Extract detailed type of web browser, layout engine, operating system, and device purely from user-agent string.

 ![It's over 9000](https://pbs.twimg.com/media/A9LpEG6CIAA5VrT.jpg)

 ## Methods

 * `getBrowser()`
-    * returns `{ name: '', major: '', version: '' }`
-
-```
-# Possible 'browser.name':
-Amaya, Arora, Avant, Baidu, Blazer, Bolt, Camino, Chimera, Chrome, Chromium, 
-Comodo Dragon, Conkeror, Dillo, Dolphin, Doris, 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, [Mobile] Safari, Mosaic, Mozilla, 
-Netfront, Netscape, NetSurf, Nokia, OmniWeb, Opera [Mini/Mobi/Tablet], Phoenix, 
-Polaris, QQBrowser, RockMelt, Silk, Skyfire, SeaMonkey, SlimBrowser, Swiftfox, 
-Tizen, UCBrowser, w3m, Yandex
-
-# 'browser.version' & 'browser.major' determined dynamically
-```
-
 * `getDevice()`
-    * returns `{ model: '', type: '', vendor: '' }` 
-
-```
-# Possible 'device.type':
-console, mobile, tablet
-
-# Possible 'device.vendor':
-Acer, Alcatel, Apple, Asus, BenQ, BlackBerry, Dell, GeeksPhone, HP, HTC, Huawei, 
-Lenovo, LG, Meizu, Motorola, Nexian, Nintendo, Nokia, Palm, Panasonic, 
-RIM, Samsung, Siemens, Sony-Ericsson, Sprint, ZTE
-
-# 'device.model' determined dynamically
-```
-
 * `getEngine()`
-    * returns `{ name: '', version: '' }`
-
-```
-# Possible 'engine.name'
-Amaya, Gecko, iCab, KHTML, Links, Lynx, NetFront, NetSurf, Presto, Tasman, 
-Trident, w3m, WebKit
-
-# 'engine.version' determined dynamically
-```
-
 * `getOS()`
-    * returns `{ name: '', version: '' }`
-
-```
-# Possible 'os.name'
-AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS, 
-Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Gentoo, GNU, Haiku, Hurd, iOS, 
-Joli, Linux, Mac OS, Mandriva, MeeGo, Minix, Mint, Morph OS, NetBSD, Nintendo, 
-OpenBSD, OS/2, Palm, PCLinuxOS, Plan9, Playstation, QNX, RedHat, RIM Tablet OS, 
-RISC OS, Slackware, Solaris, SUSE, Symbian, Tizen, Ubuntu, UNIX, WebOS, 
-Windows [Phone/Mobile], Zenwalk
-
-# 'os.version' determined dynamically
-```
-
-* `getCPU()`
-    * returns `{ architecture: '' }`
-
-```
-# Possible 'cpu.architecture'
-68k, amd64, arm, ia32, ia64, irix, irix64, mips, mips64, pa-risc, ppc, sparc, sparc64
-```
-
 * `getResult()`
-    * returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
 * `getUA()`
-    * returns UA string of current instance
 * `setUA(uastring)`
-    * set & parse UA string

 ## Example

 ```html
-<!doctype html>
-<html>
-<head>
-<script type="text/javascript" src="ua-parser.min.js"></script>
+<script type="text/javascript" src="ua-parser.js"></script>
 <script type="text/javascript">
-
+    
 	var parser = new UAParser();
-
+	
    // by default it takes ua string from current browser's window.navigator.userAgent
    console.log(parser.getResult());
    /*
        /// this will print an object structured like this:
        {
-            ua: "",
            browser: {
                name: "",
                version: "",
@@ -123,130 +55,45 @@ Windows [Phone/Mobile], Zenwalk
                model: "",
                type: "",
                vendor: ""
-            },
-            cpu: {
-                architecture: ""
            }
        }
    */

    // let's test a custom user-agent string as an example
-    var uastring = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2";
-    parser.setUA(uastring);
-
-    var result = parser.getResult();
-    // this will also produce the same result (without instantiation):
-    // var result = UAParser(uastring);
-
-    console.log(result.browser);        // {name: "Chromium", major: "15", version: "15.0.874.106"}
-    console.log(result.device);         // {model: undefined, type: undefined, vendor: undefined}
-    console.log(result.os);             // {name: "Ubuntu", version: "11.10"}
-    console.log(result.os.version);     // "11.10"
-    console.log(result.engine.name);    // "WebKit"
-    console.log(result.cpu.architecture);   // "amd64"
-
-    // do some other tests
-    var uastring2 = "Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)";
-    console.log(parser.setUA(uastring2).getBrowser().name); // "Konqueror"
-    console.log(parser.getOS());                            // {name: "OpenBSD", version: undefined}
-    console.log(parser.getEngine());                        // {name: "KHTML", version: "4.1.4"}
-
-    var uastring3 = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11';
-    console.log(parser.setUA(uastring3).getDevice().model); // "PlayBook"
-    console.log(parser.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
-    console.log(parser.getBrowser().name);                  // "Safari"
-
+    var uastr = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2";
+    parser.setUA(uastr);
+    
+    console.log(parser.getResult().browser);    // {name: "Chromium", major: "15", version: "15.0.874.106"}
+    console.log(parser.getResult().device);     // {model: undefined, type: undefined, vendor: undefined}
+    console.log(parser.getResult().engine);     // {name: "AppleWebKit", version: "535.2"}
+    console.log(parser.getResult().os);         // {name: "Ubuntu", version: "11.10"}
+    
+    // let's take another test please
+    console.log(parser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getBrowser().name); // "Konqueror"
+    console.log(parser.getOS());                // {name: "OpenBSD", version: undefined}
+    console.log(parser.getEngine());            // {name: "KHTML", version: "4.1.4"}
 </script>
-</head>
-<body>
-</body>
-</html>
 ```

-### Using node.js
+## Using node.js

 ```sh
 $ npm install ua-parser-js
 ```

 ```js
-var UAParser = require('ua-parser-js');
-var parser = new UAParser();
-var ua = request.headers['user-agent'];     // user-agent header from an HTTP request
-console.log(parser.setUA(ua).getResult());
-```
+var UAParser    = require('ua-parser');
+var parser      = new UAParser();
+var uaString    = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11';

-### Using requirejs
-
-```js
-require(['ua-parser'], function(UAParser) {
-    var parser = new UAParser();
-    console.log(parser.getResult());
-});
-```
-
-### Using component
-
-```sh
-$ component install faisalman/ua-parser-js
-```
-
-```js
-var UAParser = require('ua-parser-js');
-var parser = new UAParser();
-console.log(parser.getResult());
-```
-
-### Using bower
-
-```sh
-$ bower install ua-parser-js
-```
-
-### Using jQuery.ua
-
-Although written in vanilla js (which means it doesn't depends on jQuery), this library will automatically detect if jQuery 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)`. 
-
-```js
-// In browser with default user-agent: 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0':
-
-// Do some tests
-console.log($.ua.device);           // {vendor: "HTC", model: "Evo Shift 4G", type: "mobile"}
-console.log($.ua.os);               // {name: "Android", version: "2.3.4"}
-console.log($.ua.os.name);          // "Android"
-console.log($.ua.get());            // "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0"
-
-// reset to custom user-agent
-$.ua.set('Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; Xoom Build/HWI69) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13');
-
-// Test again
-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
-```
-
-## Development
-
-Install dependencies
-
-```sh
-$ npm install jshint
-$ npm install mocha
-$ npm install uglify-js
-```
-
-Verify, test, & minify script
-
-```sh
-$ ./build/build.sh
+console.log(parser.setUA(uaString).getDevice().model);  // "PlayBook"
+console.log(parser.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
+console.log(parser.getEngine().name);                   // "AppleWebKit"
 ```

 ## License

-Dual licensed under GPLv2 & MIT
-
-Copyright © 2012-2013 Faisalman <<fyzlman@gmail.com>>
+Copyright © 2012 Faisalman <<fyzlman@gmail.com>>

 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -1,675 +0,0 @@
-// UAParser.js v0.7.0
-// Lightweight JavaScript-based User-Agent string parser
-// https://github.com/faisalman/ua-parser-js
-//
-// Copyright © 2012-2013 Faisalman <fyzlman@gmail.com>
-// Dual licensed under GPLv2 & MIT
-
-(function (window, undefined) {
-
-    'use strict';
-
-    //////////////
-    // Constants
-    /////////////
-
-
-    var EMPTY       = '',
-        UNKNOWN     = '?',
-        FUNC_TYPE   = 'function',
-        UNDEF_TYPE  = 'undefined',
-        OBJ_TYPE    = 'object',
-        MAJOR       = 'major',
-        MODEL       = 'model',
-        NAME        = 'name',
-        TYPE        = 'type',
-        VENDOR      = 'vendor',
-        VERSION     = 'version',
-        ARCHITECTURE= 'architecture',
-        CONSOLE     = 'console',
-        MOBILE      = 'mobile',
-        TABLET      = 'tablet',
-        SMARTTV     = 'smarttv';
-
-
-    ///////////
-    // Helper
-    //////////
-
-
-    var util = {
-        has : function (str1, str2) {
-          if (typeof str1 === "string") {
-            return str2.toLowerCase().indexOf(str1.toLowerCase()) !== -1;
-          }
-        },
-        lowerize : function (str) {
-            return str.toLowerCase();
-        }
-    };
-
-
-    ///////////////
-    // Map helper
-    //////////////
-
-
-    var mapper = {
-
-        rgx : function () {
-
-            // loop through all regexes maps
-            for (var result, i = 0, j, k, p, q, matches, match, args = arguments; i < args.length; i += 2) {
-
-                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) {
-                        q = props[p];
-                        if (typeof(q) === OBJ_TYPE) {
-                            result[q[0]] = undefined;
-                        } else {
-                            result[q] = undefined;
-                        }
-                    }
-                }
-
-                // try matching uastring with regexes
-                for (j = k = 0; j < regex.length; j++) {
-                    matches = regex[j].exec(this.getUA());
-                    if (!!matches) {
-                        for (p = 0; p < props.length; p++) {
-                            match = matches[++k];
-                            q = props[p];
-                            // check if given property is actually array
-                            if (typeof(q) === OBJ_TYPE && q.length > 0) {
-                                if (q.length == 2) {
-                                    if (typeof(q[1]) == FUNC_TYPE) {
-                                        // assign modified match
-                                        result[q[0]] = q[1].call(this, match);
-                                    } else {
-                                        // assign given value, ignore regex match
-                                        result[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;
-                                    } else {
-                                        // sanitize match using given regex
-                                        result[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;
-                                }
-                            } else {
-                                result[q] = match ? match : undefined;
-                            }
-                        }
-                        break;
-                    }
-                }
-
-                if(!!matches) break; // break the loop immediately if match found
-            }
-            return result;
-        },
-
-        str : function (str, map) {
-
-            for (var i in map) {
-                // check if array
-                if (typeof(map[i]) === OBJ_TYPE && map[i].length > 0) {
-                    for (var j = 0; j < map[i].length; j++) {
-                        if (util.has(map[i][j], str)) {
-                            return (i === UNKNOWN) ? undefined : i;
-                        }
-                    }
-                } else if (util.has(map[i], str)) {
-                    return (i === UNKNOWN) ? undefined : i;
-                }
-            }
-            return str;
-        }
-    };
-
-
-    ///////////////
-    // String map
-    //////////////
-
-
-    var maps = {
-
-        browser : {
-            oldsafari : {
-                major : {
-                    '1' : ['/8', '/1', '/3'],
-                    '2' : '/4',
-                    '?' : '/'
-                },
-                version : {
-                    '1.0'   : '/8',
-                    '1.2'   : '/1',
-                    '1.3'   : '/3',
-                    '2.0'   : '/412',
-                    '2.0.2' : '/416',
-                    '2.0.3' : '/417',
-                    '2.0.4' : '/419',
-                    '?'     : '/'
-                }
-            }
-        },
-
-        device : {
-            sprint : {
-                model : {
-                    'Evo Shift 4G' : '7373KT'
-                },
-                vendor : {
-                    'HTC'       : 'APA',
-                    'Sprint'    : 'Sprint'
-                }
-            }
-        },
-
-        os : {
-            windows : {
-                version : {
-                    'ME'        : '4.90',
-                    'NT 3.11'   : 'NT3.51',
-                    'NT 4.0'    : 'NT4.0',
-                    '2000'      : 'NT 5.0',
-                    'XP'        : ['NT 5.1', 'NT 5.2'],
-                    'Vista'     : 'NT 6.0',
-                    '7'         : 'NT 6.1',
-                    '8'         : 'NT 6.2',
-                    '8.1'       : 'NT 6.3',
-                    'RT'        : 'ARM'
-                }
-            }
-        }
-    };
-
-
-    //////////////
-    // Regex map
-    /////////////
-
-
-    var regexes = {
-
-        browser : [[
-
-            /APP-([\w\s-\d]+)\/((\d+)?[\w\.]+)/i                                     // KTA App
-            ], [NAME, VERSION, MAJOR], [
-
-            // Presto based
-            /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
-            /(opera\s[mobiletab]+).+version\/((\d+)?[\w\.-]+)/i,                // Opera Mobi/Tablet
-            /(opera).+version\/((\d+)?[\w\.]+)/i,                               // Opera > 9.80
-            /(opera)[\/\s]+((\d+)?[\w\.]+)/i                                    // Opera < 9.80
-
-            ], [NAME, VERSION, MAJOR], [
-
-            /\s(opr)\/((\d+)?[\w\.]+)/i                                         // Opera Webkit
-            ], [[NAME, 'Opera'], VERSION, MAJOR], [
-
-            // Mixed
-            /(kindle)\/((\d+)?[\w\.]+)/i,                                       // Kindle
-            /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?((\d+)?[\w\.]+)*/i,
-                                                                                // Lunascape/Maxthon/Netfront/Jasmine/Blazer
-
-            // Trident based
-            /(avant\s|iemobile|slim|baidu)(?:browser)?[\/\s]?((\d+)?[\w\.]*)/i,
-                                                                                // Avant/IEMobile/SlimBrowser/Baidu
-            /(?:ms|\()(ie)\s((\d+)?[\w\.]+)/i,                                  // Internet Explorer
-
-            // Webkit/KHTML based
-            /(rekonq)((?:\/)[\w\.]+)*/i,                                        // Rekonq
-            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron)\/((\d+)?[\w\.-]+)/i
-                                                                                // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron
-            ], [NAME, VERSION, MAJOR], [
-
-            /(trident).+rv[:\s]((\d+)?[\w\.]+).+like\sgecko/i                   // IE11
-            ], [[NAME, 'IE'], VERSION, MAJOR], [
-
-            /(yabrowser)\/((\d+)?[\w\.]+)/i                                     // Yandex
-            ], [[NAME, 'Yandex'], VERSION, MAJOR], [
-
-            /(comodo_dragon)\/((\d+)?[\w\.]+)/i                                 // Comodo Dragon
-            ], [[NAME, /_/g, ' '], VERSION, MAJOR], [
-
-            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?((\d+)?[\w\.]+)/i
-                                                                                // Chrome/OmniWeb/Arora/Tizen/Nokia
-            ], [NAME, VERSION, MAJOR], [
-
-            /(dolfin)\/((\d+)?[\w\.]+)/i                                        // Dolphin
-            ], [[NAME, 'Dolphin'], VERSION, MAJOR], [
-
-            /((?:android.+)crmo|crios)\/((\d+)?[\w\.]+)/i                       // Chrome for Android/iOS
-            ], [[NAME, 'Chrome'], VERSION, MAJOR], [
-
-            /version\/((\d+)?[\w\.]+).+?mobile\/\w+\s(safari)/i                 // Mobile Safari
-            ], [VERSION, MAJOR, [NAME, 'Mobile Safari']], [
-
-            /version\/((\d+)?[\w\.]+).+?(mobile\s?safari|safari)/i              // Safari & Safari Mobile
-            ], [VERSION, MAJOR, NAME], [
-
-            /webkit.+?(mobile\s?safari|safari)((\/[\w\.]+))/i                   // Safari < 3.0
-            ], [NAME, [MAJOR, mapper.str, maps.browser.oldsafari.major], [VERSION, mapper.str, maps.browser.oldsafari.version]], [
-
-            /(konqueror)\/((\d+)?[\w\.]+)/i,                                    // Konqueror
-            /(webkit|khtml)\/((\d+)?[\w\.]+)/i
-            ], [NAME, VERSION, MAJOR], [
-
-            // Gecko based
-            /(navigator|netscape)\/((\d+)?[\w\.-]+)/i                           // Netscape
-            ], [[NAME, 'Netscape'], VERSION, MAJOR], [
-            /(swiftfox)/i,                                                      // Swiftfox
-            /(icedragon|iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo|conkeror)[\/\s]?((\d+)?[\w\.\+]+)/i,
-                                                                                // IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror
-            /(firefox|seamonkey|k-meleon|icecat|iceape|firebird|phoenix)\/((\d+)?[\w\.-]+)/i,
-                                                                                // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
-            /(mozilla)\/((\d+)?[\w\.]+).+rv\:.+gecko\/\d+/i,                    // Mozilla
-
-            // Other
-            /(uc\s?browser|polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|qqbrowser)[\/\s]?((\d+)?[\w\.]+)/i,
-                                                                                // UCBrowser/Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/QQBrowser
-            /(links)\s\(((\d+)?[\w\.]+)/i,                                      // Links
-            /(gobrowser)\/?((\d+)?[\w\.]+)*/i,                                  // GoBrowser
-            /(ice\s?browser)\/v?((\d+)?[\w\._]+)/i,                             // ICE Browser
-            /(mosaic)[\/\s]((\d+)?[\w\.]+)/i                                    // Mosaic
-            ], [NAME, VERSION, MAJOR], [
-
-            /(apple(?:coremedia|))\/((\d+)[\w\._]+)/i,                          // Generic Apple CoreMedia
-            /(coremedia) v((\d+)[\w\._]+)/i
-            ], [NAME, VERSION, MAJOR], [
-
-            /(aqualung|lyssna|bsplayer)\/((\d+)?[\w\.-]+)/i                     // Aqualung/Lyssna/BSPlayer
-            ], [NAME, VERSION], [
-
-            /(ares|ossproxy)\s((\d+)[\w\.-]+)/i                                 // Ares/OSSProxy
-            ], [NAME, VERSION, MAJOR], [
-
-            /(audacious|audimusicstream|amarok|bass|core|dalvik|gnomemplayer|music on console|nsplayer|psp-internetradioplayer|videos)\/((\d+)[\w\.-]+)/i,
-                                                                                // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/Dalvik/GnomeMplayer/MoC
-                                                                                // NSPlayer/PSP-InternetRadioPlayer/Videos
-            /(clementine|music player daemon)\s((\d+)[\w\.-]+)/i,               // Clementine/MPD
-            /(lg player|nexplayer)\s((\d+)[\d\.]+)/i,
-            /player\/(nexplayer|lg player)\s((\d+)[\w\.-]+)/i                   // NexPlayer/LG Player
-            ], [NAME, VERSION, MAJOR], [
-            /(nexplayer)\s((\d+)[\w\.-]+)/i                                     // Nexplayer
-            ], [NAME, VERSION, MAJOR], [
-
-            /(flrp)\/((\d+)[\w\.-]+)/i                                          // Flip Player
-            ], [[NAME, 'Flip Player'], VERSION, MAJOR], [
-
-            /(fstream|nativehost|queryseekspider|ia-archiver|facebookexternalhit)/i
-                                                                                // FStream/NativeHost/QuerySeekSpider/IA Archiver/facebookexternalhit
-            ], [NAME], [
-
-            /(gstreamer) souphttpsrc (?:\([^\)]+\)){0,1} libsoup\/((\d+)[\w\.-]+)/i
-                                                                                // Gstreamer
-            ], [NAME, VERSION, MAJOR], [
-
-            /(htc streaming player)\s[\w_]+\s\/\s((\d+)[\d\.]+)/i,              // HTC Streaming Player
-            /(java|python-urllib|python-requests|wget|libcurl)\/((\d+)[\w\.-_]+)/i,
-                                                                                // Java/urllib/requests/wget/cURL
-            /(lavf)((\d+)[\d\.]+)/i                                             // Lavf (FFMPEG)
-            ], [NAME, VERSION, MAJOR], [
-
-            /(htc_one_s)\/((\d+)[\d\.]+)/i,                                     // HTC One S
-            ], [[NAME, /_/g, ' '], VERSION, MAJOR], [
-
-            /(mplayer)(?:\s|\/)(?:(?:sherpya-){0,1}svn)(?:-|\s)(r\d+(?:-\d+[\w\.-]+){0,1})/i,
-                                                                                // MPlayer SVN
-            ], [NAME, VERSION], [
-
-            /(mplayer)(?:\s|\/|[unkow-]+)((\d+)[\w\.-]+)/i,                     // MPlayer
-            ], [NAME, VERSION, MAJOR], [
-
-            /(mplayer)/i,                                                       // MPlayer (no other info)
-            /(yourmuze)/i,                                                      // YourMuze
-            /(media player classic|nero showtime)/i                             // Media Player Classic/Nero ShowTime
-            ], [NAME], [
-
-            /(nero (?:home|scout))\/((\d+)[\w\.-]+)/i                           // Nero Home/Nero Scout
-            ], [NAME, VERSION, MAJOR], [
-
-            /(nokia\d+)\/((\d+)[\w\.-]+)/i                                      // Nokia
-            ], [NAME, VERSION, MAJOR], [
-
-            /\s(songbird)\/((\d+)[\w\.-]+)/i                                    // Songbird/Philips-Songbird
-            ], [NAME, VERSION, MAJOR], [
-
-            /(winamp)3 version ((\d+)[\w\.-]+)/i,                               // Winamp
-            /(winamp)\s((\d+)[\w\.-]+)/i,
-            /(winamp)mpeg\/((\d+)[\w\.-]+)/i
-            ], [NAME, VERSION, MAJOR], [
-
-            /(ocms-bot|tapinradio|tunein radio|unknown|winamp|inlight radio)/i  // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
-                                                                                // inlight radio
-            ], [NAME], [
-
-            /(quicktime|rma|radioapp|radioclientapplication|soundtap|totem|stagefright|streamium)\/((\d+)[\w\.-]+)/i
-                                                                                // QuickTime/RealMedia/RadioApp/RadioClientApplication/
-                                                                                // SoundTap/Totem/Stagefright/Streamium
-            ], [NAME, VERSION, MAJOR], [
-
-            /(smp)((\d+)[\d\.]+)/i                                              // SMP
-            ], [NAME, VERSION, MAJOR], [
-
-            /(vlc) media player - version ((\d+)[\w\.]+)/i,                     // VLC Videolan
-            /(vlc)\/((\d+)[\w\.-]+)/i,
-            /(xbmc|gvfs|xine|xmms|irapp)\/((\d+)[\w\.-]+)/i,                    // XBMC/gvfs/Xine/XMMS/irapp
-            /(foobar2000)\/((\d+)[\d\.]+)/i,                                    // Foobar2000
-            /(itunes)\/((\d+)[\d\.]+)/i                                         // iTunes
-            ], [NAME, VERSION, MAJOR], [
-
-            /(wmplayer)\/((\d+)[\w\.-]+)/i,                                     // Windows Media Player
-            /(windows-media-player)\/((\d+)[\w\.-]+)/i
-            ], [[NAME, /-/g, ' '], VERSION, MAJOR], [
-
-            /windows\/((\d+)[\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ (home media server)/i,
-                                                                                // Windows Media Server
-            ], [VERSION, MAJOR, [NAME, 'Windows']], [
-
-            /(com\.riseupradioalarm)\/((\d+)[\d\.]*)/i                          // RiseUP Radio Alarm
-            ], [NAME, VERSION, MAJOR], [
-
-            /(rad.io)\s((\d+)[\d\.]+)/i,                                        // Rad.io
-            /(radio.(?:de|at|fr))\s((\d+)[\d\.]+)/i
-            ], [[NAME, 'rad.io'], VERSION, MAJOR]
-
-        ],
-
-        cpu : [[
-
-            /(?:(amd|x(?:(?:86|64)[_-])?|wow|win)64)[;\)]/i                     // AMD64
-            ], [[ARCHITECTURE, 'amd64']], [
-
-            /(ia32(?=;))/i                                                      // IA32 (quicktime)
-            ], [[ARCHITECTURE, util.lowerize]], [
-
-            /((?:i[346]|x)86)[;\)]/i                                            // IA32
-            ], [[ARCHITECTURE, 'ia32']], [
-
-            // PocketPC mistakenly identified as PowerPC
-            /windows\s(ce|mobile);\sppc;/i
-            ], [[ARCHITECTURE, 'arm']], [
-
-            /((?:ppc|powerpc)(?:64)?)(?:\smac|;|\))/i                           // PowerPC
-            ], [[ARCHITECTURE, /ower/, '', util.lowerize]], [
-
-            /(sun4\w)[;\)]/i                                                    // SPARC
-            ], [[ARCHITECTURE, 'sparc']], [
-
-            /(ia64(?=;)|68k(?=\))|arm(?=v\d+;)|(?:irix|mips|sparc)(?:64)?(?=;)|pa-risc)/i
-                                                                                // IA64, 68K, ARM, IRIX, MIPS, SPARC, PA-RISC
-            ], [ARCHITECTURE, util.lowerize]
-        ],
-
-        device : [[
-
-            /\((ipad|playbook);[\w\s\);-]+(rim|apple)/i                         // iPad/PlayBook
-            ], [MODEL, VENDOR, [TYPE, TABLET]], [
-
-            /applecoremedia\/[\w\.]+ \((ipad)/                                  // iPad
-            ], [MODEL, [VENDOR, 'Apple'], [TYPE, TABLET]], [
-
-            /(apple\s{0,1}tv)/i                                                 // Apple TV
-            ], [[MODEL, 'Apple TV'], [VENDOR, 'Apple']], [
-
-            /(hp).+(touchpad)/i,                                                // HP TouchPad
-            /(kindle)\/([\w\.]+)/i,                                             // Kindle
-            /\s(nook)[\w\s]+build\/(\w+)/i,                                     // Nook
-            /(dell)\s(strea[kpr\s\d]*[\dko])/i                                  // Dell Streak
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
-
-            /(kf[A-z]+)\sbuild\/[\w\.]+.*silk\//i,                              // Kindle Fire HD
-            ], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
-
-            /\((ip[honed|\s\w*]+);.+(apple)/i                                   // iPod/iPhone
-            ], [MODEL, VENDOR, [TYPE, MOBILE]], [
-            /\((ip[honed|\s\w*]+);/i                                            // iPod/iPhone
-            ], [MODEL, [VENDOR, 'Apple'], [TYPE, MOBILE]], [
-
-            /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|huawei|meizu|motorola)[\s_-]?([\w-]+)*/i,
-                                                                                // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Huawei/Meizu/Motorola
-            /(hp)\s([\w\s]+\w)/i,                                               // HP iPAQ
-            /(asus)-?(\w+)/i                                                    // Asus
-            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
-            /\((bb10);\s(\w+)/i                                                 // BlackBerry 10
-            ], [[VENDOR, 'BlackBerry'], MODEL, [TYPE, MOBILE]], [
-                                                                                // Asus Tablets
-            /android.+((transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus 7))/i
-            ], [[VENDOR, 'Asus'], MODEL, [TYPE, TABLET]], [
-
-            /(sony)\s(tablet\s[ps])/i                                           // Sony Tablets
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
-
-            /(nintendo)\s([wids3u]+)/i                                          // Nintendo
-            ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
-
-            /((playstation)\s[3portablevi]+)/i                                  // Playstation
-            ], [[VENDOR, 'Sony'], MODEL, [TYPE, CONSOLE]], [
-
-            /(sprint\s(\w+))/i                                                  // Sprint Phones
-            ], [[VENDOR, mapper.str, maps.device.sprint.vendor], [MODEL, mapper.str, maps.device.sprint.model], [TYPE, MOBILE]], [
-
-            /(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
-            ], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [
-
-                                                                                // Motorola
-            /\s((milestone|droid(?:[2-4x]|\s(?:bionic|x2|pro|razr))?(:?\s4g)?))[\w\s]+build\//i,
-            /(mot)[\s-]?(\w+)*/i
-            ], [[VENDOR, 'Motorola'], MODEL, [TYPE, MOBILE]], [
-            /android.+\s((mz60\d|xoom[\s2]{0,2}))\sbuild\//i
-            ], [[VENDOR, 'Motorola'], MODEL, [TYPE, TABLET]], [
-
-            /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n8000|sgh-t8[56]9|nexus 10))/i
-            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [                  // Samsung
-            /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i,
-            /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i,
-            /sec-((sgh\w+))/i
-            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, MOBILE]], [
-            /(sie)-(\w+)*/i                                                     // Siemens
-            ], [[VENDOR, 'Siemens'], MODEL, [TYPE, MOBILE]], [
-
-            /(maemo|nokia).*(n900|lumia\s\d+)/i,                                // Nokia
-            /(nokia)[\s_-]?([\w-]+)*/i
-            ], [[VENDOR, 'Nokia'], MODEL, [TYPE, MOBILE]], [
-
-            /android\s3\.[\s\w-;]{10}((a\d{3}))/i                               // Acer
-            ], [[VENDOR, 'Acer'], MODEL, [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, [TYPE, SMARTTV]], [
-            /((nexus\s[45]))/i,                                                 // LG
-            /(lg)[e;\s-\/]+(\w+)*/i
-            ], [[VENDOR, 'LG'], MODEL, [TYPE, MOBILE]], [
-                
-             /android.+((ideatab[a-z0-9\-\s]+))/i                               // Lenovo
-            ], [[VENDOR, 'Lenovo'], MODEL, [TYPE, TABLET]], [
-
-            /(mobile|tablet);.+rv\:.+gecko\//i                                  // Unidentifiable
-            ], [TYPE, VENDOR, MODEL]
-        ],
-
-        engine : [[
-            /APP-([\w\s-\d]+)\/((\d+)?[\w\.]+)/i                                     // KTA App
-            ], [[NAME, 'Mobile-App'], VERSION], [
-
-            /(presto)\/([\w\.]+)/i,                                             // Presto
-            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m)\/([\w\.]+)/i,     // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m
-            /(khtml|tasman|links)[\/\s]\(?([\w\.]+)/i,                          // KHTML/Tasman/Links
-            /(icab)[\/\s]([23]\.[\d\.]+)/i                                      // iCab
-            ], [NAME, VERSION], [
-
-            /rv\:([\w\.]+).*(gecko)/i                                           // Gecko
-            ], [VERSION, NAME]
-        ],
-
-        os : [[
-
-            // Windows based
-            /microsoft\s(windows)\s(vista|xp)/i,                                // Windows (iTunes)
-            ], [NAME, VERSION], [
-            /(windows)\snt\s6\.2;\s(arm)/i,                                     // Windows RT
-            /(windows\sphone(?:\sos)*|windows\smobile|windows)[\s\/]?([ntce\d\.\s]+\w)/i
-            ], [NAME, [VERSION, mapper.str, maps.os.windows.version]], [
-            /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
-            ], [[NAME, 'Windows'], [VERSION, mapper.str, maps.os.windows.version]], [
-
-            // Mobile/Embedded OS
-            /\((bb)(10);/i                                                      // BlackBerry 10
-            ], [[NAME, 'BlackBerry'], VERSION], [
-            /(blackberry)\w*\/?([\w\.]+)*/i,                                    // Blackberry
-            /(tizen)\/([\w\.]+)/i,                                              // Tizen
-            /(android|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i
-                                                                                // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo
-            ], [NAME, VERSION], [
-            /(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]+)*/i                 // Symbian
-            ], [[NAME, 'Symbian'], VERSION],[
-            /mozilla.+\(mobile;.+gecko.+firefox/i                               // Firefox OS
-            ], [[NAME, 'Firefox OS'], VERSION], [
-
-            // Console
-            /(nintendo|playstation)\s([wids3portablevu]+)/i,                    // Nintendo/Playstation
-
-            // GNU/Linux based
-            /(mint)[\/\s\(]?(\w+)*/i,                                           // Mint
-            /(joli|[kxln]?ubuntu|debian|[open]*suse|gentoo|arch|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk)[\/\s-]?([\w\.-]+)*/i,
-                                                                                // Joli/Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware
-                                                                                // Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk
-            /(hurd|linux)\s?([\w\.]+)*/i,                                       // Hurd/Linux
-            /(gnu)\s?([\w\.]+)*/i                                               // GNU
-            ], [NAME, VERSION], [
-
-            /(cros)\s[\w]+\s([\w\.]+\w)/i                                       // Chromium OS
-            ], [[NAME, 'Chromium OS'], VERSION],[
-
-            // Solaris
-            /(sunos)\s?([\w\.]+\d)*/i                                           // Solaris
-            ], [[NAME, 'Solaris'], VERSION], [
-
-            // BSD based
-            /\s([frentopc-]{0,4}bsd|dragonfly)\s?([\w\.]+)*/i                   // FreeBSD/NetBSD/OpenBSD/PC-BSD/DragonFly
-            ], [NAME, VERSION],[
-
-            /(ip[honead]+)(?:.*os\s*([\w]+)*\slike\smac|;\sopera)/i             // iOS
-            ], [[NAME, 'iOS'], [VERSION, /_/g, '.']], [
-
-            /(mac\sos\sx)\s?([\w\s\.]+\w)*/i                                    // Mac OS
-            ], [NAME, [VERSION, /_/g, '.']], [
-
-            // Other
-            /(haiku)\s(\w+)/i,                                                  // Haiku
-            /(aix)\s((\d)(?=\.|\)|\s)[\w\.]*)*/i,                               // AIX
-            /(macintosh|mac(?=_powerpc)|plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos)/i,
-                                                                                // Plan9/Minix/BeOS/OS2/AmigaOS/MorphOS/RISCOS
-            /(unix)\s?([\w\.]+)*/i                                              // UNIX
-            ], [NAME, VERSION]
-        ]
-    };
-
-
-    /////////////////
-    // Constructor
-    ////////////////
-
-
-    var UAParser = function (uastring) {
-
-        var ua = uastring || ((window && window.navigator && window.navigator.userAgent) ? window.navigator.userAgent : EMPTY);
-
-        if (!(this instanceof UAParser)) {
-            return new UAParser(uastring).getResult();
-        }
-        this.getBrowser = function () {
-            return mapper.rgx.apply(this, regexes.browser);
-        };
-        this.getCPU = function () {
-            return mapper.rgx.apply(this, regexes.cpu);
-        };
-        this.getDevice = function () {
-            return mapper.rgx.apply(this, regexes.device);
-        };
-        this.getEngine = function () {
-            return mapper.rgx.apply(this, regexes.engine);
-        };
-        this.getOS = function () {
-            return mapper.rgx.apply(this, regexes.os);
-        };
-        this.getResult = function() {
-            return {
-                ua      : this.getUA(),
-                browser : this.getBrowser(),
-                engine  : this.getEngine(),
-                os      : this.getOS(),
-                device  : this.getDevice(),
-                cpu     : this.getCPU()
-            };
-        };
-        this.getUA = function () {
-            return ua;
-        };
-        this.setUA = function (uastring) {
-            ua = uastring;
-            return this;
-        };
-        this.setUA(ua);
-    };
-
-
-    ///////////
-    // Export
-    //////////
-
-
-    // check js environment
-    if (typeof(exports) !== UNDEF_TYPE) {
-        // nodejs env
-        if (typeof(module) !== UNDEF_TYPE && module.exports) {
-            exports = module.exports = UAParser;
-        }
-        exports.UAParser = UAParser;
-    } else {
-        // browser env
-        window.UAParser = UAParser;
-        // requirejs env (optional)
-        if (typeof(define) === FUNC_TYPE && define.amd) {
-            define(function () {
-                return UAParser;
-            });
-        }
-        // jQuery specific (optional)
-        if (typeof(window.jQuery) !== UNDEF_TYPE) {
-            var $ = window.jQuery;
-            var parser = new UAParser();
-            $.ua = parser.getResult();
-            $.ua.get = function() {
-                return parser.getUA();
-            };
-            $.ua.set = function (uastring) {
-                parser.setUA(uastring);
-                var result = parser.getResult();
-                for (var prop in result) {
-                    $.ua[prop] = result[prop];
-                }
-            };
-        }
-    }
-
-})(this);
--- a/src/ua-parser.min.js
+++ b/src/ua-parser.min.js
--- a/test.js
+++ b/test.js
--- a/test/browser-test.json
+++ b/test/browser-test.json
--- a/test/cpu-test.json
+++ b/test/cpu-test.json
@@ -1,122 +0,0 @@
-[
-    {
-        "desc"    : "i686",
-        "ua"      : "Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:19.0) Gecko/20100101 Firefox/19.0",
-        "expect"  :
-        {
-            "architecture"  : "ia32"
-        }
-    },
-    {
-        "desc"    : "i386",
-        "ua"      : "Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7) Gecko/20040628 Epiphany/1.2.6",
-        "expect"  :
-        {
-            "architecture"  : "ia32"
-        }
-    },
-    {
-        "desc"    : "x86-64",
-        "ua"      : "Opera/9.80 (X11; Linux x86_64; U; Linux Mint; en) Presto/2.2.15 Version/10.10",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "win64",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; Win64; x64; Trident/6.0; .NET4.0E; .NET4.0C)",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "WOW64",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "ARMv6",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux armv61; en-US; rv:1.9.1b2pre) Gecko/20081015 Fennec/1.0a1",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "Pocket PC",
-        "ua"      : "Opera/9.7 (Windows Mobile; PPC; Opera Mobi/35166; U; en) Presto/2.2.1",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "Mac PowerPC",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 4.5; Mac_PowerPC)",
-        "expect"  :
-        {
-            "architecture"  : "ppc"
-        }
-    },
-    {
-        "desc"    : "Mac PowerPC",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 5.17; Mac_PowerPC Mac OS; en)",
-        "expect"  :
-        {
-            "architecture"  : "ppc"
-        }
-    },
-    {
-        "desc"    : "Mac PowerPC",
-        "ua"      : "iCab/2.9.5 (Macintosh; U; PPC; Mac OS X)",
-        "expect"  :
-        {
-            "architecture"  : "ppc"
-        }
-    },
-    {
-        "desc"    : "UltraSPARC",
-        "ua"      : "Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.9b5) Gecko/2008032620 Firefox/3.0b5",
-        "expect"  :
-        {
-            "architecture"  : "sparc"
-        }
-    },
-    {
-        "desc"    : "QuickTime",
-        "ua"      : "QuickTime/7.5.6 (qtver=7.5.6;cpu=IA32;os=Mac 10.5.8)",
-        "expect"  : 
-        {
-            "architecture"  : "ia32"
-        }
-    },
-    {
-        "desc"    : "XBMC",
-        "ua"      : "XBMC/12.0 Git:20130127-fb595f2 (Windows NT 6.1;WOW64;Win64;x64; http://www.xbmc.org)",
-        "expect"  : 
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "KTB iPad",
-        "ua"      :  "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
-        {
-            "architecture"  : "undefined"
-        }
-    },
-    {
-        "desc"    : "KTB-Nexus 5",
-        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
-        "expect"  :
-        {
-            "architecture"  : "undefined"
-        }
-    }
-]
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -1,242 +0,0 @@
-[
-    {
-        "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"  :
-        {
-            "vendor"  : "HTC",
-            "model"   : "Evo Shift 4G",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "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"  :
-        {
-            "vendor"  : "LG",
-            "model"   : "Nexus 4",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "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"  :
-        {
-            "vendor"  : "LG",
-            "model"   : "Nexus 5",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "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"  :
-        {
-            "vendor"  : "Motorola",
-            "model"   : "DROID RAZR 4G",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "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"  :
-        {
-            "vendor"  : "Apple",
-            "model"   : "iPhone",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "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"  :
-        {
-            "vendor"  : "Apple",
-            "model"   : "iPod touch",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "AppleCoreMedia",
-        "ua"      : "AppleCoreMedia/1.0.0.10A403 (iPad; U; CPU OS 6_0 like Mac OS X; it_it)",
-        "expect"  : 
-        {
-            "vendor"  : "Apple",
-            "model"   : "iPad",
-            "type"    : "tablet"
-        }
-    },
-    {
-        "desc"    : "AppleTV",
-        "ua"      : "AppleTV/3.0.2 (Macintosh; Intel Mac OS X 10.4.7) AppleWebKit/528.18",
-        "expect"  : 
-        {
-            "vendor"  : "Apple",
-            "model"   : "Apple TV",
-            "type"    : "undefined"
-        }
-    },
-    {
-        "desc"    : "AppleTV",
-        "ua"      : "AppleCoreMedia/1.0.0.11B511d (Apple TV; U; CPU OS 7_0_3 like Mac OS X; es_es)",
-        "expect"  : 
-        {
-            "vendor"  : "Apple",
-            "model"   : "Apple TV",
-            "type"    : "undefined"
-        }
-    },
-    {
-        "desc"    : "Dalvik",
-        "ua"      : "Dalvik/1.2.0 (Linux; U; Android 2.2.1; GT-S5830L Build/FROYO)",
-        "expect"  : 
-        {
-            "vendor"  : "Samsung",
-            "model"   : "GT-S5830L",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "GStreamer",
-        "ua"      : "GStreamer souphttpsrc (compatible; LG NetCast.TV-2012) libsoup/2.34.2",
-        "expect"  : 
-        {
-            "vendor"  : "LG",
-            "model"   : "undefined",
-            "type"    : "smarttv"
-        }
-    },
-    {
-        "desc"    : "HTC Streaming Player",
-        "ua"      : "HTC Streaming Player htc_asia_wwe / 1.0 / endeavoru / 4.1.1",
-        "expect"  : 
-        {
-            "vendor"  : "HTC",
-            "model"   : "undefined",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "HTC One S",
-        "ua"      : "HTC_One_S/3.16.111.10",
-        "expect"  : 
-        {
-            "vendor"  : "HTC",
-            "model"   : "One S",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "LG Player",
-        "ua"      : "LG Player 1.0; Android",
-        "expect"  : 
-        {
-            "vendor"  : "LG",
-            "model"   : "undefined",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "NexPlayer",
-        "ua"      : "LG-P700/V10k-DEC-12-2012 Player/NexPlayer 4.0 for Android",
-        "expect"  : 
-        {
-            "vendor"  : "LG",
-            "model"   : "P700",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "LG Player",
-        "ua"      : "LGE400/V10b Player/LG Player 1.0",
-        "expect"  : 
-        {
-            "vendor"  : "LG",
-            "model"   : "E400",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "Nokia3xx",
-        "ua"      : "Nokia303/14.87 CLDC-1.1",
-        "expect"  : 
-        {
-            "vendor"  : "Nokia",
-            "model"   : "303",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "KTB-iPhone",
-        "ua"      : "APP-BE/1.0 (iPhone; Apple; CPU iPhone OS 7_0 like Mac OS X)",
-        "expect"  :
-        {
-            "vendor"  : "Apple",
-            "model"   : "iPhone",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "stagefright",
-        "ua"      : "Samsung GT-I9070 stagefright/1.1 (Linux;Android 2.3.6)",
-        "expect"  : 
-        {
-            "vendor"  : "Samsung",
-            "model"   : "GT-I9070",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "KTB-iPod Touch",
-        "ua"      : "APP-BE/1.0 (iPod touch; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
-        {
-            "vendor"  : "Apple",
-            "model"   : "iPod touch",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "desc"    : "rad.io",
-        "ua"      : "rad.io 1.18.1 rv:593 (iPhone 4S; iPhone OS 7.0.4; it_IT)",
-        "expect"  : 
-        {
-            "vendor"  : "Apple",
-            "model"   : "iPhone 4S",
-            "type"    : "mobile"
-        }
-    },
-    {
-        "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"  :
-        {
-            "vendor"  : "Amazon",
-            "model"   : "KFTT",
-            "type"    : "tablet"
-        }
-    },
-    {
-        "desc"    : "KTB-iPad",
-        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
-        {
-            "vendor"  : "Apple",
-            "model"   : "iPad",
-            "type"    : "tablet"
-        }
-    },
-    {
-        "desc"    : "KTB-Nexus 5",
-        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
-        "expect"  :
-        {
-            "vendor"  : "LG",
-            "model"   : "Nexus 5",
-            "type"    : "mobile"
-        }
-    }
-]
--- a/test/engine-test.json
+++ b/test/engine-test.json
@@ -1,84 +0,0 @@
-[
-    {
-        "desc"    : "Gecko",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9pre) Gecko/20110111 Firefox/4.0b9pre",
-        "expect"  :
-        {
-            "name"    : "Gecko",
-            "version" : "2.0b9pre"
-        }
-    },
-    {
-        "desc"    : "KHTML",
-        "ua"      : "Mozilla/5.0 (compatible; Konqueror/4.5; FreeBSD) KHTML/4.5.4 (like Gecko)",
-        "expect"  :
-        {
-            "name"    : "KHTML",
-            "version" : "4.5.4"
-        }
-    },
-    {
-        "desc"    : "NetFront",
-        "ua"      : "Mozilla/4.0 (PDA; Windows CE/1.0.1) NetFront/3.0",
-        "expect"  :
-        {
-            "name"    : "NetFront",
-            "version" : "3.0"
-        }
-    },
-    {
-        "desc"    : "Presto",
-        "ua"      : "Opera/9.80 (Windows NT 6.1; Opera Tablet/15165; U; en) Presto/2.8.149 Version/11.1",
-        "expect"  :
-        {
-            "name"    : "Presto",
-            "version" : "2.8.149"
-        }
-    },
-    {
-        "desc"    : "Tasman",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; PPC Mac OS X 10.4.7; Tasman 1.0)",
-        "expect"  :
-        {
-            "name"    : "Tasman",
-            "version" : "1.0"
-        }
-    },
-    {
-        "desc"    : "Trident",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)",
-        "expect"  :
-        {
-            "name"    : "Trident",
-            "version" : "6.0"
-        }
-    },
-    {
-        "desc"    : "WebKit",
-        "ua"      : "Mozilla/5.0 (Windows; U; Windows NT 6.1; sv-SE) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4",
-        "expect"  :
-        {
-            "name"    : "WebKit",
-            "version" : "533.19.4"
-        }
-    },
-    {
-        "desc"    : "KTA Mobile App",
-        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
-        {
-            "name"    : "Mobile-App",
-            "version" : "1.0"
-        }
-    },
-    {
-        "desc"    : "KTB-Nexus 5",
-        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
-        "expect"  :
-        {
-            "name"    : "Mobile-App",
-            "version" : "1.0"
-        }
-    }
-
-]
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -1,596 +0,0 @@
-[
-    {
-        "desc"    : "Windows 95",
-        "ua"      : "Mozilla/1.22 (compatible; MSIE 2.0; Windows 95)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "95"
-        }
-    },
-    {
-        "desc"    : "Windows 98",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 4.01; Windows 98)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "98"
-        }
-    },
-    {
-        "desc"    : "Windows ME",
-        "ua"      : "Mozilla/5.0 (Windows; U; Win 9x 4.90) Gecko/20020502 CS 2000 7.0/7.0",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "ME"
-        }
-    },
-    {
-        "desc"    : "Windows 2000",
-        "ua"      : "Mozilla/3.0 (compatible; MSIE 3.0; Windows NT 5.0)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "2000"
-        }
-    },
-    {
-        "desc"    : "Windows XP",
-        "ua"      : "Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 5.2)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "XP"
-        }
-    },
-    {
-        "desc"    : "Windows Vista",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 6.0; fr-FR)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "Vista"
-        }
-    },
-    {
-        "desc"    : "Windows 7",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "7"
-        }
-    },
-    {
-        "desc"    : "Windows 8",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; Win64; x64; Trident/6.0; .NET4.0E; .NET4.0C)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "8"
-        }
-    },
-    {
-        "desc"    : "Windows RT",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "RT"
-        }
-    },
-    {
-        "desc"    : "Windows CE",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 7.11)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "CE"
-        }
-    },
-    {
-        "desc"    : "Windows Mobile",
-        "ua"      : "Mozilla/5.0 (ZTE-E_N72/N72V1.0.0B02;U;Windows Mobile/6.1;Profile/MIDP-2.0 Configuration/CLDC-1.1;320*240;CTC/2.0) IE/6.0 (compatible; MSIE 4.01; Windows CE; PPC)/UC Browser7.7.1.88",
-        "expect"  :
-        {
-            "name"    : "Windows Mobile",
-            "version" : "6.1"
-        }
-    },
-    {
-        "desc"    : "Windows Phone OS",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; DELL; Venue Pro)",
-        "expect"  :
-        {
-            "name"    : "Windows Phone OS",
-            "version" : "7.0"
-        }
-    },
-    {
-        "desc"    : "Windows Phone 8",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; HTC; Windows Phone 8X by HTC)",
-        "expect"  :
-        {
-            "name"    : "Windows Phone",
-            "version" : "8.0"
-        }
-    },
-    {
-        "desc"    : "BlackBerry",
-        "ua"      : "BlackBerry9300/5.0.0.912 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/378",
-        "expect"  :
-        {
-            "name"    : "BlackBerry",
-            "version" : "5.0.0.912"
-        }
-    },
-    {
-        "desc"    : "BlackBerry 10",
-        "ua"      : "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.3+ (KHTML, like Gecko) Version/10.0.9.386 Mobile Safari/537.3+",
-        "expect"  :
-        {
-            "name"    : "BlackBerry",
-            "version" : "10"
-        }
-    },
-    {
-        "desc"    : "Tizen",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Android",
-        "ua"      : "Mozilla/5.0 (Linux; U; Android 2.2.2; en-us; VM670 Build/FRG83G) AppleWebKit/533.1 (KHTML, like Gecko)",
-        "expect"  :
-        {
-            "name"    : "Android",
-            "version" : "2.2.2"
-        }
-    },
-    {
-        "desc"    : "WebOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Palm OS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "QNX",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Bada",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "RIM Tablet OS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "MeeGo",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Symbian",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Firefox OS",
-        "ua"      : "Mozilla/5.0 (Mobile; rv:14.0) Gecko/14.0 Firefox/14.0",
-        "expect"  :
-        {
-            "name"    : "Firefox OS",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Nintendo",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "PlayStation",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Joli",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Ubuntu",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Debian",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "OpenSUSE",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Gentoo",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Arch",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Slackware",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Fedora",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Mandriva",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "CentOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "PCLinuxOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "RedHat",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Zenwalk",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Hurd",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Linux",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "GNU",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Chromium OS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Solaris",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "FreeBSD",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "OpenBSD",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "NetBSD",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "DragonFly",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "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",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "5.1.1"
-        }
-    },
-    {
-        "desc"    : "iOS with Opera Mini",
-        "ua"      : "Opera/9.80 (iPhone; Opera Mini/7.1.32694/27.1407; U; en) Presto/2.8.119 Version/11.10",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Mac OS",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Mac OS X",
-            "version" : "10.6.8"
-        }
-    },
-    {
-        "desc"    : "Haiku",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "AIX",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Plan9",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Minix",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "BeOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "OS/2",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "AmigaOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "MorphOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "UNIX",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "iTunes Windows Vista",
-        "ua"      : "iTunes/10.7 (Windows; Microsoft Windows Vista Home Premium Edition Service Pack 1 (Build 6001)) AppleWebKit/536.26.9",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "Vista"
-        }
-    },
-    {
-        "desc"    : "",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "iOS BE App",
-        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "7.0.2"
-        }
-    },
-    {
-        "desc"    : "KTB-Nexus 5",
-        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
-        "expect"  :
-        {
-            "name"    : "Android",
-            "version" : "4.2.1"
-        }
-    }
-]
--- a/test/test.js
+++ b/test/test.js
@@ -1,65 +0,0 @@
-var assert      = require('assert');
-var UAParser    = require('./../src/ua-parser');
-var browsers    = require('./browser-test.json');
-var cpus        = require('./cpu-test.json');
-var devices     = require('./device-test.json');
-var engines     = require('./engine-test.json');
-var os          = require('./os-test.json');
-var parser      = new UAParser();
-var methods     = [
-    {
-        title       : 'getBrowser',
-        label       : 'browser',
-        list        : browsers,
-        properties  : ['name', 'major', 'version']
-    },
-    {
-        title       : 'getCPU',
-        label       : 'cpu',
-        list        : cpus,
-        properties  : ['architecture']
-    },
-    {
-        title       : 'getDevice',
-        label       : 'device',
-        list        : devices,
-        properties  : ['model', 'type', 'vendor']
-    },
-    {
-        title       : 'getEngine',
-        label       : 'engine',
-        list        : engines,
-        properties  : ['name', 'version']
-    },
-    {
-        title       : 'getOS',
-        label       : 'os',
-        list        : os,
-        properties  : ['name', 'version']
-}];
-
-describe('UAParser()', function () {
-    var ua = 'Mozilla/5.0 (Windows NT 6.2) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1090.0 Safari/536.6';
-    assert.deepEqual(UAParser(ua), new UAParser().setUA(ua).getResult());
-});
-
-for (var i in methods) {
-    describe(methods[i]['title'], function () {
-        for (var j in methods[i]['list']) {
-            if (!!methods[i]['list'][j].ua) {
-                describe('[' + methods[i]['list'][j].desc + ']', function () {
-                    describe('"' + methods[i]['list'][j].ua + '"', function () {                
-                        var expect = methods[i]['list'][j].expect;
-                        var result = parser.setUA(methods[i]['list'][j].ua).getResult()[methods[i]['label']];  
-
-                        methods[i]['properties'].forEach(function(m) {
-                            it('should return ' + methods[i]['label'] + ' ' + m + ': ' + expect[m], function () {
-                                assert.equal(result[m], expect[m] != 'undefined' ? expect[m] : undefined);
-                            });
-                        });
-                    });
-                });
-            }
-        }
-    });
-}
--- 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.0",
-    "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/src/ua-parser.min.js"
-}
--- a/ua-parser.js
+++ b/ua-parser.js
@@ -0,0 +1,407 @@
+// UA-Parser.JS v0.5.1
+// Lightweight JavaScript-based User-Agent string parser
+// https://github.com/faisalman/ua-parser-js
+//
+// Copyright © 2012 Faisalman
+// Dual licensed under GPLv2 & MIT
+
+(function (global, undefined) {
+
+    'use strict';
+    
+    var EMPTY       = '',
+        FUNC        = 'function',
+        UNDEF       = 'undefined',
+        OBJ         = 'object',        
+        MAJOR       = 'major',
+        MODEL       = 'model',
+        NAME        = 'name',
+        TYPE        = 'type',
+        VENDOR      = 'vendor',
+        VERSION     = 'version',        
+        CONSOLE     = 'console',
+        MOBILE      = 'mobile',
+        TABLET      = 'tablet';
+
+    var mapper = {
+
+        regex : function () {
+
+            var result, i, j, k, l, m, args = arguments;
+
+            // loop through all regexes maps
+            for (i = 0; i < args.length; i += 2) {
+
+                var regex = args[i],       // odd sequence (0,2,4,..)
+                    props = args[i + 1];   // even sequence (1,3,5,..)
+
+                // construct object barebones
+                if (typeof result === UNDEF) {
+                    result = {};
+                    for (k = 0; k < props.length; k++) {
+                        if (typeof props[k] === OBJ) {
+                            result[props[k][0]] = undefined;
+                        } else {
+                            result[props[k]] = undefined;
+                        }
+                    }
+                    if (this.getUA().toString() === EMPTY) {
+                        return result;
+                    }
+                }
+
+                // try matching uastring with regexes
+                for (j = 0; j < regex.length; j++) {
+                    l = regex[j].exec(this.getUA());
+                    if (!!l) {
+                        for (k = 0; k < props.length; k++) {
+                            m = l[k + 1];
+                            if (typeof props[k] === OBJ && props[k].length === 2) {
+                                result[props[k][0]] = props[k][1];
+                            } else if (typeof props[k] === OBJ && props[k].length === 3) {
+                                if (typeof props[k][1] === FUNC && !(props[k][1].exec && props[k][1].test)) {
+                                    result[props[k][0]] = m ? props[k][1].call(this, m, props[k][2]) : undefined;
+                                } else {
+                                    result[props[k][0]] = m ? m.replace(props[k][1], props[k][2]) : undefined;
+                                }
+                            } else {
+                                result[props[k]] = m ? m : undefined;
+                            }
+                        }
+                        break;
+                    }
+                }
+
+                if(!!l) break; // break the loop immediately if match found
+            }
+            return result;
+        },
+
+        string : function (str, map) {
+
+            for (var i in map) {
+                if (map.hasOwnProperty(i)) {
+                    if (typeof map[i] === OBJ && map[i].length > 0) {
+                        for (var j = 0; j < map[i].length; j++) {
+                            if (str.toLowerCase().indexOf(map[i][j].toLowerCase()) !== -1) {
+                                return (i.toString() === UNDEF) ? undefined : i;
+                            }
+                        }
+                    } else if (str.toLowerCase().indexOf(map[i].toLowerCase()) !== -1) {
+                        return (i.toString() === UNDEF) ? undefined : i;
+                    }
+                }
+            }
+            return str;
+        }
+    };
+
+    var maps = {
+        
+        browser : {        
+            oldsafari : {            
+                major : {
+                    '1' : ['/85', '/125', '/312'],
+                    '2' : ['/412', '/416', '/417', '/419'],
+                    'undefined' : '/'
+                },                
+                version : {
+                    '1.0'   : '/85',
+                    '1.2'   : '/125',
+                    '1.3'   : '/312',
+                    '2.0'   : '/412',
+                    '2.0.2' : '/416',
+                    '2.0.3' : '/417',
+                    '2.0.4' : '/419',
+                    'undefined' : '/'
+                }
+            }
+        },
+        
+        device : {        
+            htc : {            
+                model : {
+                    'Evo Shift 4G' : '7373KT'
+                }
+            }
+        },
+        
+        os : {        
+            windows : {            
+                version : {
+                    'ME'        : '4.90',
+                    'NT 3.11'   : 'NT3.51',
+                    'NT 4.0'    : 'NT4.0',
+                    '2000'      : 'NT 5.0',
+                    'XP'        : ['NT 5.1', 'NT 5.2'],
+                    'Vista'     : 'NT 6.0',
+                    '7'         : 'NT 6.1',
+                    '8'         : 'NT 6.2',
+                    'RT'        : 'ARM'
+                }
+            }
+        }
+    };
+
+    var regexes = {
+
+        browser : [[
+
+            // Presto based
+            /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
+            /(opera\s[mobiletab]+).+version\/((\d+)?[\w\.-]+)/i,                // Opera Mobi/Tablet
+            /(opera).+version\/((\d+)?[\w\.]+)/i,                               // Opera > 9.80
+            /(opera)[\/\s]+((\d+)?[\w\.]+)/i,                                   // Opera < 9.80
+
+            // Mixed
+            /(kindle)\/((\d+)?[\w\.]+)/i,                                       // Kindle
+            /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?((\d+)?[\w\.]+)*/i,
+                                                                                // Lunascape/Maxthon/Netfront/Jasmine/Blazer
+
+            // Trident based
+            /(avant\sbrowser|iemobile|slimbrowser|baidubrowser)[\/\s]?((\d+)?[\w\.]*)/i,
+                                                                                // Avant/IEMobile/SlimBrowser/Baidu
+            /ms(ie)\s((\d+)?[\w\.]+)/i,                                         // Internet Explorer
+
+            // Webkit/KHTML based
+            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt)\/((\d+)?[\w\.-]+)/i
+                                                                                // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt
+            ], [NAME, VERSION, MAJOR], [
+            
+            /(yabrowser)\/((\d+)?[\w\.]+)/i                                     // Yandex
+            ], [[NAME, 'Yandex'], VERSION, MAJOR], [
+            
+            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?((\d+)?[\w\.]+)/i
+                                                                                // Chrome/OmniWeb/Arora/Tizen/Nokia
+            ], [NAME, VERSION, MAJOR], [
+            
+            /(dolfin)\/((\d+)?[\w\.]+)/i                                        // Dolphin
+            ], [[NAME, 'Dolphin'], VERSION, MAJOR], [
+            
+            /((?:android.+)crmo|crios)\/((\d+)?[\w\.]+)/i                       // Chrome for Android/iOS
+            ], [[NAME, 'Chrome'], VERSION, MAJOR], [
+            
+            /version\/((\d+)?[\w\.]+).+?mobile\/\w+\s(safari)/i                 // Mobile Safari
+            ], [VERSION, MAJOR, [NAME, 'Mobile Safari']], [
+            
+            /version\/((\d+)?[\w\.]+).+?(mobile\s?safari|safari)/i              // Safari & Safari Mobile
+            ], [VERSION, MAJOR, NAME], [
+            
+            /applewebkit.+?(mobile\s?safari|safari)((\/[\w\.]+))/i              // Safari < 3.0
+            ], [NAME, [MAJOR, mapper.string, maps.browser.oldsafari.major], [VERSION, mapper.string, maps.browser.oldsafari.version]], [
+            
+            /(konqueror)\/((\d+)?[\w\.]+)/i,                                    // Konqueror
+            /(applewebkit|khtml)\/((\d+)?[\w\.]+)/i
+            ], [NAME, VERSION, MAJOR], [
+
+            // Gecko based
+            /(navigator|netscape)\/((\d+)?[\w\.-]+)/i                           // Netscape
+            ], [[NAME, 'Netscape'], VERSION, MAJOR], [
+            /(swiftfox)/i,                                                      // Swiftfox
+            /(iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i,
+                                                                                // Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo
+            /(firefox|seamonkey|k-meleon|icecat|iceape|firebird|phoenix)\/((\d+)?[\w\.-]+)/i,
+                                                                                // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
+            /(mozilla)\/((\d+)?[\w\.]+).+rv\:.+gecko\/\d+/i,                    // Mozilla
+
+            // Other
+            /(uc\s?browser|polaris|lynx|dillo|icab|doris)[\/\s]?((\d+)?[\w\.]+)/i,
+                                                                                // UCBrowser/Polaris/Lynx/Dillo/iCab/Doris
+            /(gobrowser)\/?((\d+)?[\w\.]+)*/i,                                  // GoBrowser
+            /(mosaic)[\/\s]((\d+)?[\w\.]+)/i                                    // Mosaic
+            ], [NAME, VERSION, MAJOR]
+        ],
+
+        device : [[
+
+            /\((ipad|playbook);[\w\s\);-]+(rim|apple)/i                         // iPad/PlayBook
+            ], [MODEL, VENDOR, [TYPE, TABLET]], [
+            
+            /(hp).+(touchpad)/i,                                                // HP TouchPad
+            /(kindle)\/([\w\.]+)/i,                                             // Kindle
+            /\s(nook)[\w\s]+build\/(\w+)/i,                                     // Nook
+            /(dell)\s(strea[kpr\s\d]*[\dko])/i                                  // Dell Streak
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+
+            /\((ip[honed]+);.+(apple)/i                                         // iPod/iPhone
+            ], [MODEL, VENDOR, [TYPE, MOBILE]], [
+            
+            /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|huawei|meizu|motorola)[\s_-]?([\w-]+)*/i,
+                                                                                // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Huawei/Meizu/Motorola
+            /(hp)\s([\w\s]+\w)/i,                                               // HP iPAQ
+            /(asus)-?(\w+)/i                                                    // Asus
+            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
+            /\((bb10);\s(\w+)/i                                                 // BlackBerry 10
+            ], [[VENDOR, 'BlackBerry'], MODEL, [TYPE, MOBILE]], [
+
+            /android.+((transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+))/i       // Asus Tablets
+            ], [[VENDOR, 'Asus'], MODEL, [TYPE, TABLET]], [
+
+            /(sony)\s(tablet\s[ps])/i                                           // Sony Tablets
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+
+            /(nintendo|playstation)\s([wids3portablev]+)/i                      // Nintendo/Playstation
+            ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
+            
+            /(sprint\sapa)(\w+)/i
+            ], [[VENDOR, 'HTC'], [MODEL, mapper.string, maps.device.htc.model], [TYPE, MOBILE]], [
+            /(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i,                               // HTC
+            
+            /(zte)-(\w+)*/i                                                     // ZTE
+            ], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [
+
+            /\s((milestone|droid[2x]?))[globa\s]*\sbuild\//i,                   // Motorola
+            /(mot)[\s-]?(\w+)*/i
+            ], [[VENDOR, 'Motorola'], MODEL, [TYPE, MOBILE]], [
+            /android.+\s((mz60\d|xoom[\s2]{0,2}))\sbuild\//i
+            ], [[VENDOR, 'Motorola'], MODEL, [TYPE, TABLET]], [
+
+            /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n8000|sgh-t8[56]9))/i
+            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [          // Samsung
+            /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i,
+            /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i,
+            /sec-((sgh\w+))/i
+            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, MOBILE]], [
+            /(sie)-(\w+)*/i                                                     // Siemens
+            ], [[VENDOR, 'Siemens'], MODEL, [TYPE, MOBILE]], [
+
+            /(maemo|nokia).*(n900|lumia\s\d+)/i,                                // Nokia
+            /(nokia)[\s_-]?([\w-]+)*/i
+            ], [[VENDOR, 'Nokia'], MODEL, [TYPE, MOBILE]], [
+
+            /android\s3\.[\s\w-;]{10}((a\d{3}))/i                               // Acer
+            ], [[VENDOR, 'Acer'], MODEL, [TYPE, TABLET]], [
+
+            /android\s3\.[\s\w-;]{10}(lg?)-([06cv9]{3,4})/i                     // LG
+            ], [[VENDOR, 'LG'], MODEL, [TYPE, TABLET]], [
+            /(lg)[e;\s-\/]+(\w+)*/i
+            ], [[VENDOR, 'LG'], MODEL, [TYPE, MOBILE]], [
+            
+            /(mobile|tablet);.+rv\:.+gecko\//i                                  // Unidentifiable
+            ], [TYPE, VENDOR, MODEL]
+        ],
+
+        engine : [[
+
+            /(presto)\/([\w\.]+)/i,                                             // Presto
+            /(webkit|trident|netfront)\/([\w\.]+)/i,                            // WebKit/Trident/NetFront
+            /(khtml)\/([\w\.]+)/i,                                              // KHTML
+            /(tasman)\s([\w\.]+)/i                                              // Tasman
+            ], [NAME, VERSION], [
+
+            /rv\:([\w\.]+).*(gecko)/i                                           // Gecko
+            ], [VERSION, NAME]
+        ],
+
+        os : [[
+
+            // Windows based
+            /(windows)\snt\s6\.2;\s(arm)/i,                                     // Windows RT
+            /(windows\sphone\sos|windows\smobile|windows)[\s\/]?([ntce\d\.\s]+\w)/i
+            ], [NAME, [VERSION, mapper.string, maps.os.windows.version]], [
+            /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
+            ], [[NAME, 'Windows'], [VERSION, mapper.string, maps.os.windows.version]], [
+
+            // Mobile/Embedded OS
+            /\((bb)(10);/i                                                      // BlackBerry 10
+            ], [[NAME, 'BlackBerry'], VERSION], [
+            /(blackberry)\w*\/?([\w\.]+)*/i,                                    // Blackberry
+            /(tizen)\/([\w\.]+)/i,                                              // Tizen
+            /(android|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i
+                                                                                // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo
+            ], [NAME, VERSION], [
+            /(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]+)*/i                 // Symbian
+            ], [[NAME, 'Symbian'], VERSION],[
+
+            /(nintendo|playstation)\s([wids3portablev]+)/i,                     // Nintendo/Playstation
+
+            // GNU/Linux based
+            /(mint)[\/\s\(]?(\w+)*/i,                                           // Mint
+            /(joli|[kxln]?ubuntu|debian|[open]*suse|gentoo|arch|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk)[\/\s-]?([\w\.-]+)*/i,
+                                                                                // Joli/Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware
+                                                                                // Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk
+            /(hurd|linux)\s?([\w\.]+)*/i,                                       // Hurd/Linux
+            /(gnu)\s?([\w\.]+)*/i                                               // GNU
+            ], [NAME, VERSION], [
+
+            /(cros)\s[\w]+\s([\w\.]+\w)/i                                       // Chromium OS
+            ], [[NAME, 'Chromium OS'], VERSION],[
+
+            // Solaris
+            /(sunos)\s?([\w\.]+\d)*/i                                           // Solaris
+            ], [[NAME, 'Solaris'], VERSION], [
+
+            // BSD based
+            /\s(\w*bsd|dragonfly)\s?([\w\.]+)*/i                                // FreeBSD/NetBSD/OpenBSD/DragonFly
+            ], [NAME, VERSION],[
+
+            /(ip[honead]+)(?:.*os\s*([\w]+)*\slike\smac|;\sopera)/i             // iOS
+            ], [[NAME, 'iOS'], [VERSION, /_/g, '.']], [
+
+            /(mac\sos\sx)\s?([\w\s\.]+\w)*/i                                    // Mac OS
+            ], [NAME, [VERSION, /_/g, '.']], [
+
+            // Other
+            /(haiku)\s(\w+)/i,                                                  // Haiku
+            /(aix)\s((\d)(?=\.|\)|\s)[\w\.]*)*/i,                               // AIX                    
+            /(macintosh|mac(?=_powerpc)|plan\s9|minix|beos|os\/2|amigaos|morphos)/i,
+                                                                                // Plan9/Minix/BeOS/OS2/AmigaOS/MorphOS
+            /(unix)\s?([\w\.]+)*/i                                              // UNIX
+            ], [NAME, VERSION]
+        ]
+    };
+
+    var UAParser = function UAParser (uastring) {
+
+        var ua = uastring || ((global && global.navigator && global.navigator.userAgent) ? global.navigator.userAgent : EMPTY);
+
+        this.getBrowser = function () {
+            return mapper.regex.apply(this, regexes.browser);
+        };
+
+        this.getDevice = function () {
+            return mapper.regex.apply(this, regexes.device);
+        };
+
+        this.getEngine = function () {
+            return mapper.regex.apply(this, regexes.engine);
+        };
+
+        this.getOS = function () {
+            return mapper.regex.apply(this, regexes.os);
+        };
+
+        this.getResult = function() {
+            return {
+                browser : this.getBrowser(),
+                engine  : this.getEngine(),
+                os      : this.getOS(),
+                device  : this.getDevice()
+            };
+        };
+
+        this.getUA = function() {
+            return ua;
+        };
+
+        this.setUA = function (uastring) {
+            ua = uastring;
+            return this;
+        };
+
+        this.setUA(ua);
+    };
+
+    // check js environment    
+    if (typeof exports !== UNDEF && !/\[object\s[DOM]*Window\]/.test(global.toString())) {
+        // nodejs env
+        if (typeof module !== UNDEF && module.exports) {
+            exports = module.exports = UAParser;
+        }
+        exports.UAParser = UAParser;
+    } else {
+        // browser env
+        global['UAParser'] = UAParser;
+    }
+})(this);
--- a/ua-parser.min.js
+++ b/ua-parser.min.js