Increment minor version

2025-11-16 07:02:16 +03:00 · 2014-06-25 14:05:58 +07:00
26 changed files with 1618 additions and 5154 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: ua-parser-js
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: ['https://www.paypal.me/faisalman/']
--- a/.github/workflows/run-test.yml
+++ b/.github/workflows/run-test.yml
@@ -1,17 +0,0 @@
-name: ua-parser-js-run-test
-
-on: [push, pull_request]
-
-jobs:
-  run-test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [amd64, ppc64le]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-      - name: Run the test
-        run: |
-          npm install
-          npm run test-ci
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,12 @@
 node_modules/
 npm-debug.log
-
+<<<<<<< HEAD
 ### vim ###
 .*.s[a-w][a-z]
 *.un~
 Session.vim
 .netrwhist
 *~
-.versions
-
-### editors ###
-.vscode
-.idea
-*.sublime-*

 ### OSX ###
 .DS_Store
@@ -20,9 +14,13 @@ Session.vim
 .LSOverride
 Icon

+
 # Thumbnails
 ._*

 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+=======
+.idea
+>>>>>>> baf4bb99b4ef92c71419931e8fd334e34c051e52
--- a/.npmrc
+++ b/.npmrc
@@ -1 +0,0 @@
-package-lock=false
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,6 @@
-arch:
- - amd64
- - ppc64le
 language: node_js
 node_js:
-    - stable
-    - lts/*
-
+  - 0.8
+  - 0.6
 notifications:
  email: false
-
-cache:
-    directories:
-        - node_modules
-
-sudo: false
-
-script: npm run test-ci
--- a/bower.json
+++ b/bower.json
@@ -1,17 +1,39 @@
 {
-  "name": "ua-parser-js",
-  "version": "0.7.27",
-  "authors": [
-    "Faisal Salman <f@faisalman.com>"
-  ],
-  "private": false,
-  "main": "src/ua-parser.js",
-  "ignore": [
-    "build",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {}
+    "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
@@ -0,0 +1,37 @@
+#!/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/changelog.md
+++ b/changelog.md
@@ -1,3 +0,0 @@
-# UAParser.js Changelog
-
-## Version 0.8.0
--- a/component.json
+++ b/component.json
@@ -0,0 +1,14 @@
+{
+  "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/dist/ua-parser.html
+++ b/dist/ua-parser.html
@@ -1 +0,0 @@
-<script src="./ua-parser.min.js"></script>
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
--- a/dist/ua-parser.pack.js
+++ b/dist/ua-parser.pack.js
--- a/license.md
+++ b/license.md
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2012-2021 Faisal Salman <<f@faisalman.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 the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/package.js
+++ b/package.js
@@ -1,12 +0,0 @@
-Package.describe({
-  name: 'faisalman:ua-parser-js',
-  version: '0.7.27',
-  summary: 'Lightweight JavaScript-based user-agent string parser',
-  git: 'https://github.com/faisalman/ua-parser-js.git',
-  documentation: 'readme.md'
-});
-
-Package.onUse(function (api) {
-  api.addFiles("src/ua-parser.js");
-  api.export("UAParser");
-});
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
  "title": "UAParser.js",
  "name": "ua-parser-js",
-  "version": "0.7.27",
-  "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
+  "version": "0.7.0",
+  "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
  "description": "Lightweight JavaScript-based user-agent string parser",
  "keywords": [
    "user-agent",
@@ -11,143 +11,57 @@
    "engine",
    "os",
    "device",
-    "cpu",
-    "jquery-plugin",
-    "ecosystem:jquery"
+    "cpu"
  ],
-  "homepage": "https://github.com/faisalman/ua-parser-js",
+  "homepage": "http://github.com/faisalman/ua-parser-js",
  "contributors": [
-    "Aamir Poonawalla <aamir@urx.com>",
-    "Admas <mollases@users.noreply.github.com>",
-    "algenon <m@antonz.ru>",
-    "Alvin Portillo <portilloalvin@gmail.com>",
-    "Andrea Vaghi <andrea.vaghi@jobrapido.com>",
-    "Anton Zhiyanov <m@antonz.ru>",
-    "Arturo Mejia <amejia@blim.com>",
-    "Arun Rama Reddy <arunramareddy@gmail.com>",
-    "Austin Pray <austin@austinpray.com>",
+    "Faisal Salman <fyzlman@gmail.com>",
    "Benjamin Bertrand <bertrand.design@gmail.com>",
-    "Benjamin Urban <benjamin.urban@sueddeutsche.de>",
-    "boneyao <admin@boneyao.com>",
-    "Carl C Von Lewin <carlchristianlewin@gmail.com>",
-    "CESAR RAMOS <c@imagenproactiva.com>",
    "Christopher De Cairos <chris.decairos@gmail.com>",
-    "Dario Vladovic <d.vladimyr@gmail.com>",
    "Davit Barbakadze <jayarjo@gmail.com>",
-    "ddivernois <david-emmanuel.divernois@amadeus.com>",
-    "Demis Palma <demis.palma@gmail.com>",
-    "dhoko <aurelien@protonmail.com>",
-    "dianhe <dianhe@webank.com>",
    "Dmitry Tyschenko <dtyschenko@gmail.com>",
    "Douglas Li <doug@knotch.it>",
-    "Dumitru Uzun <contact@duzun.me>",
-    "Eric Schrenker <eric.schrenker@gmail.com>",
    "Erik Hesselink <hesselink@gmail.com>",
    "Fabian Becker <halfdan@xnorfz.de>",
-    "Faisal Salman <fyzlman@gmail.com>",
-    "Frédéric Camblor <fcamblor@gmail.com>",
-    "Germán M. Bravo <german.mb@gmail.com>",
-    "Grigory Dmitrenko <grigory@snsk.ru>",
-    "Hendrik Helwich <h.helwich@iplabs.de>",
-    "Hermann Ebert <ebbmo@HE.local>",
-    "jackpoll <jackpoll123456@gmail.com>",
+    "Jackpoll <jackpoll123456@gmail.com>",
    "Jake Mc <startswithaj@users.noreply.github.com>",
    "John Tantalo <john.tantalo@gmail.com>",
    "John Yanarella <jmy@codecatalyst.com>",
    "Jon Buckley <jon@jbuckley.ca>",
-    "Kendall Buchanan <kendall@kendagriff.com>",
    "Lee Treveil <leetreveil@gmail.com>",
-    "leonardo <leofiore@libero.it>",
-    "Levente Balogh <balogh.levente.hu@gmail.com>",
-    "Liam Quinn <lquinn@blackberry.com>",
-    "Lithin <lithin@webklipper.com>",
-    "Loris Guignard <loris.guignard@gmail.com>",
-    "Lukas Drgon <lukas.drgon@gmail.com>",
-    "Lukas Eipert <leipert@users.noreply.github.com>",
-    "Malash <i@malash.me>",
-    "Martynas <martynas@firmfirm.co>",
-    "Matt Brophy <matt@brophy.org>",
-    "Max Maurer <maxemanuel.maurer@gmail.com>",
-    "Maximilian Haupt <mail@maximilianhaupt.com>",
+    "Leonardo <leofiore@libero.it>",
    "Michael Hess <mhess@connectify.me>",
-    "naoh <naoh.cs03g@nctu.edu.tw>",
-    "Nik Rolls <nik@rolls.cc>",
-    "Nikhil Motiani <nikhil.m@247-inc.com>",
-    "niris <nirisix@gmail.com>",
-    "Nobuo Okada <nookada@yahoo-corp.jp>",
-    "otakuSiD <otakusid@gmail.com>",
-    "Peter Dave Hello <PeterDaveHello@users.noreply.github.com>",
-    "philippsimon <github@philippsimon.de>",
-    "Pieter Hendrickx <pieter.hendrickx@belfius.be>",
-    "Piper Chester <piperchester@gmail.com>",
-    "Robert Tod <robert@qubit.com>",
-    "Ron Korland <ron@testim.io>",
    "Ross Noble <rosshnoble@gmail.com>",
-    "Sandro Sonntag <sandro.sonntag@adorsys.de>",
-    "sgautrea <shanegautreau@gmail.com>",
-    "Shane Gautreau <sgautrea@opentext.com>",
-    "Shane Thacker <shane@steadymade.com>",
-    "shchotse <topal@mail.ua>",
-    "Simon Eisenmann <simon@longsleep.org>",
-    "Simon Lang <me@simonlang.org>",
-    "Stiekel <histkc@gmail.com>",
-    "Sylvain Gizard <sylvain.gizard@gmail.com>",
-    "szchenghuang <szchenghuang@gmail.com>",
-    "Vadim Kurachevsky <vadim@hmvs.org>",
-    "Yun Young-jin <yupmin@yupmin-office-macmini.local>",
-    "Insanehong <insae.hong@navercorp.com>"
+    "Sandro Sonntag <sandro.sonntag@adorsys.de>"
  ],
  "main": "src/ua-parser.js",
  "scripts": {
-    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments --compress --mangle",
-    "test": "jshint src/ua-parser.js && mocha -R nyan test/test.js",
-    "test-ci": "jshint src/ua-parser.js && mocha -R spec test/test.js",
-    "verup": "node ./node_modules/verup",
-    "version": "node ./node_modules/verup 0"
-  },
-  "verup": {
-    "files": [
-      "bower.json",
-      "package.js",
-      "src/ua-parser.js"
-    ],
-    "regs": [
-      "^((?:\\$|(\\s*\\*\\s*@)|(\\s*(?:var|,)?\\s+))(?:LIBVERSION|version)[\\s\\:='\"]+)([0-9]+(?:\\.[0-9]+){2,2})",
-      "^(\\s?\\*.*v)([0-9]+(?:\\.[0-9]+){2,2})"
-    ]
+    "test": "./build/build.sh"
  },
  "devDependencies": {
-    "jshint": "~2.12.0",
-    "mocha": "~8.2.0",
-    "requirejs": "^2.3.2",
-    "safe-regex": "^2.1.1",
-    "uglify-js": "~3.12.0",
-    "verup": "^1.3.x"
+    "jshint": "~1.1.0",
+    "mocha": "~1.7.1",
+    "uglify-js": "~1.3.4"
  },
-  "repository": {
+  "repository" : {
    "type": "git",
    "url": "https://github.com/faisalman/ua-parser-js.git"
  },
-  "license": "MIT",
+  "licenses": [
+    {
+      "type": "GPLv2",
+      "url": "http://www.gnu.org/licenses/gpl-2.0.html"
+    },
+    {
+      "type": "MIT",
+      "url": "http://www.opensource.org/licenses/mit-license.php"
+    }
+  ],
  "engines": {
    "node": "*"
  },
  "directories": {
-    "dist": "dist",
-    "src": "src",
+    "lib": "src",
    "test": "test"
-  },
-  "bugs": "https://github.com/faisalman/ua-parser-js/issues",
-  "demo": "https://faisalman.github.io/ua-parser-js",
-  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.min.js",
-  "funding": [
-    {
-      "type": "opencollective",
-      "url": "https://opencollective.com/ua-parser-js"
-    },
-    {
-      "type": "paypal",
-      "url": "https://paypal.me/faisalman"
-    }
-  ]
+  }
 }
--- a/readme.md
+++ b/readme.md
@@ -1,71 +1,49 @@
-<p align="center">
-    <img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/logo.png" width="256" height="256"> 
-</p>
-
-<p align="center">
-<a href="https://travis-ci.org/faisalman/ua-parser-js"><img src="https://travis-ci.org/faisalman/ua-parser-js.svg?branch=master"></a>
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/v/ua-parser-js.svg"></a>
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/dw/ua-parser-js.svg"></a>
-<a href="https://www.jsdelivr.com/package/npm/ua-parser-js"><img src="https://data.jsdelivr.com/v1/package/npm/ua-parser-js/badge"></a>
-<a href="https://cdnjs.com/libraries/UAParser.js"><img src="https://img.shields.io/cdnjs/v/UAParser.js.svg"></a>
-</p>
-
 # UAParser.js

-JavaScript library to detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data with relatively small footprint (~17KB minified, ~6KB gzipped) that can be used either in browser (client-side) or node.js (server-side).
+Lightweight JavaScript-based User-Agent string parser. Supports browser & node.js environment. Also available as Component package, Bower package, jQuery.ua, & AMD module

-* Author    : Faisal Salman <<f@faisalman.com>>
-* Demo      : http://faisalman.github.io/ua-parser-js
+[![Build Status](https://travis-ci.org/faisalman/ua-parser-js.png?branch=master)](https://travis-ci.org/faisalman/ua-parser-js)
+
+* Author    : Faisalman <<fyzlman@gmail.com>>
+* Demo      : http://faisalman.github.com/ua-parser-js
 * Source    : https://github.com/faisalman/ua-parser-js

-# Documentation
+## Features

-## Constructor
+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.

-* `new UAParser([uastring][,extensions])`
-    * returns new instance
-
-* `UAParser([uastring][,extensions])`
-    * returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
+![It's over 9000](https://pbs.twimg.com/media/A9LpEG6CIAA5VrT.jpg)

 ## Methods

 * `getBrowser()`
-    * returns `{ name: '', version: '' }`
+    * returns `{ name: '', major: '', version: '' }`

-```sh
+```
 # Possible 'browser.name':
-2345Explorer, 360 Browser, Amaya, Android Browser, Arora, Avant, Avast, AVG,
-BIDUBrowser, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
-Chrome Headless, Chrome WebView, Chrome, Chromium, Comodo Dragon, Dillo,
-Dolphin, Doris, Edge, Electron, Epiphany, Facebook, Falkon, Fennec, Firebird,
-Firefox [Reality], Flock, Flow, GSA, GoBrowser, ICE Browser, IE, IEMobile, IceApe, 
-IceCat, IceDragon, Iceweasel, Instagram, Iridium, Iron, Jasmine, K-Meleon,
-Kindle, Konqueror, LBBROWSER, Line, Links, Lunascape, Lynx, MIUI Browser,
-Maemo Browser, Maemo, Maxthon, MetaSr Midori, Minimo, Mobile Safari, Mosaic,
-Mozilla, NetFront, NetSurf, Netfront, Netscape, NokiaBrowser, Oculus Browser,
-OmniWeb, Opera Coast, Opera [Mini/Mobi/Tablet], PaleMoon, PhantomJS, Phoenix, 
-Polaris, Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, Safari, 
-Sailfish Browser, Samsung Browser, SeaMonkey, Silk, Skyfire, Sleipnir, Slim, 
-SlimBrowser, Swiftfox, Tizen Browser, UCBrowser, Vivaldi, Waterfox, WeChat, Weibo,
-Yandex, baidu, iCab, w3m, Whale Browser...
+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' determined dynamically
+# 'browser.version' & 'browser.major' determined dynamically
 ```

 * `getDevice()`
-    * returns `{ model: '', type: '', vendor: '' }`
+    * returns `{ model: '', type: '', vendor: '' }` 

-```sh
+```
 # Possible 'device.type':
-console, mobile, tablet, smarttv, wearable, embedded
+console, mobile, tablet

 # Possible 'device.vendor':
-Acer, Alcatel, Amazon, Apple, Archos, ASUS, AT&T, BenQ, BlackBerry, Dell,
-Essential, Fairphone, GeeksPhone, Google, HP, HTC, Huawei, Jolla, Lenovo, LG, 
-Meizu, Microsoft, Motorola, Nexian, Nintendo, Nokia, Nvidia, OnePlus, OPPO, Ouya,
-Palm, Panasonic, Pebble, Polytron, Realme, RIM, Samsung, Sharp, Siemens,
-Sony[Ericsson], Sprint, Vivo, Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...
+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
 ```
@@ -73,10 +51,10 @@ Sony[Ericsson], Sprint, Vivo, Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...
 * `getEngine()`
    * returns `{ name: '', version: '' }`

-```sh
+```
 # Possible 'engine.name'
-Amaya, Blink, EdgeHTML, Flow, Gecko, Goanna, iCab, KHTML, Links, Lynx, NetFront,
-NetSurf, Presto, Tasman, Trident, w3m, WebKit
+Amaya, Gecko, iCab, KHTML, Links, Lynx, NetFront, NetSurf, Presto, Tasman, 
+Trident, w3m, WebKit

 # 'engine.version' determined dynamically
 ```
@@ -84,15 +62,14 @@ NetSurf, Presto, Tasman, Trident, w3m, WebKit
 * `getOS()`
    * returns `{ name: '', version: '' }`

-```sh
+```
 # Possible 'os.name'
-AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS,
-Contiki, Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Fuchsia, Gentoo, GNU,
-Haiku, Hurd, iOS, Joli, KaiOS, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo,
-Minix, Mint, Morph OS, NetBSD, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD,
-PCLinuxOS, Plan9, PlayStation, QNX, Raspbian, RedHat, RIM Tablet OS, RISC OS,
-Sailfish, Series40, Slackware, Solaris, SUSE, Symbian, Tizen, Ubuntu, Unix, 
-VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk, ...
+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
 ```
@@ -100,42 +77,39 @@ VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk, ...
 * `getCPU()`
    * returns `{ architecture: '' }`

-```sh
+```
 # Possible 'cpu.architecture'
-68k, amd64, arm[64/hf], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, sparc[64]
+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 UA string to be parsed
-    * returns current instance
+    * set & parse UA string

-# Usage
-
-## Using HTML
+## Example

 ```html
 <!doctype html>
 <html>
 <head>
-<script src="ua-parser.min.js"></script>
-<script>
+<script type="text/javascript" src="ua-parser.min.js"></script>
+<script type="text/javascript">

-    var parser = new UAParser();
+	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:
+        /// this will print an object structured like this:
        {
            ua: "",
            browser: {
                name: "",
                version: "",
-                major: "" //@deprecated
+                major: ""
            },
            engine: {
                name: "",
@@ -155,23 +129,23 @@ VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk, ...
            }
        }
    */
-    // Default result depends on current window.navigator.userAgent value

-    // Now let's try a custom user-agent string as an example
-    var uastring1 = "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(uastring1);
+    // 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();
-    // You can also use UAParser constructor directly without having to create an instance:
-    // var result = UAParser(uastring1);
+    // this will also produce the same result (without instantiation):
+    // var result = UAParser(uastring);

-    console.log(result.browser);        // {name: "Chromium", version: "15.0.874.106"}
+    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
+    // 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}
@@ -189,49 +163,60 @@ VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk, ...
 </html>
 ```

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

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

 ```js
-var http = require('http');
-var parser = require('ua-parser-js');
-
-http.createServer(function (req, res) {
-    // get user-agent header
-    var ua = parser(req.headers['user-agent']);
-    // write the result as response
-    res.end(JSON.stringify(ua, null, '  '));
-})
-.listen(1337, '127.0.0.1');
-
-console.log('Server running at http://127.0.0.1:1337/');
+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());
 ```

-## Using TypeScript
-
-```sh
-$ npm install --save @types/ua-parser-js
-# Download TS type definition from DefinitelyTyped repository:
-# https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/ua-parser-js
-```
-
-## Using jQuery/Zepto ($.ua)
-
-Although written in vanilla js, this library will automatically detect if jQuery/Zepto is present and create `$.ua` object (with values based on its User-Agent) along with `window.UAParser` constructor. To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`.
+### Using requirejs

 ```js
-// Say we are in a 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':
+require(['ua-parser'], function(UAParser) {
+    var parser = new UAParser();
+    console.log(parser.getResult());
+});
+```

-// Get the details
+### 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"

-// Now lets try to reset to another custom user-agent
+// 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
@@ -239,70 +224,36 @@ console.log($.ua.browser.name);     // "Safari"
 console.log($.ua.engine.name);      // "Webkit"
 console.log($.ua.device);           // {vendor: "Motorola", model: "Xoom", type: "tablet"}
 console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
-
-// Add class to <body> tag
-// <body class="ua-browser-safari ua-devicetype-tablet">
-$('body').addClass('ua-browser-' + $.ua.browser.name + ' ua-devicetype-' + $.ua.device.type);
 ```

-## Using Extension
+## Development

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

-```js
-// Example:
-var myOwnListOfBrowsers = [
-    [/(mybrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION]
-];
-var myParser = new UAParser({ browser: myOwnListOfBrowsers });
-var myUA = 'Mozilla/5.0 MyBrowser/1.3';
-console.log(myParser.setUA(myUA).getBrowser());  // {name: "MyBrowser", version: "1.3"}
+```sh
+$ npm install jshint
+$ npm install mocha
+$ npm install uglify-js
 ```

-# Development
+Verify, test, & minify script

-## Sponsors
+```sh
+$ ./build/build.sh
+```

-<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/tiers/backers.svg?avatarHeight=64" height="80"/></a> <a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/tiers/sponsors.svg?avatarHeight=64" height="80"/></a>
+## License

-<a href="https://www.paypal.me/faisalman/"><img src="https://cdn.rawgit.com/twolfson/paypal-github-button/1.0.0/dist/button.svg" height="40"></a>
+Dual licensed under GPLv2 & MIT

-## Contributors
+Copyright © 2012-2013 Faisalman <<fyzlman@gmail.com>>

-<a href="https://github.com/faisalman/ua-parser-js/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=faisalman/ua-parser-js" />
-</a>
+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 
+the Software without restriction, including without limitation the rights to use, 
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the 
+Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:

-Made with [contributors-img](https://contrib.rocks).
-
-## How To Contribute
-
-* Fork and clone this repository
-* Make some changes as required
-* Write unit test to showcase its functionality
-* Run the test suites to make sure it's not breaking anything `$ npm test`
-* Submit a pull request under `develop` branch
-
-# License
-
-MIT License
-
-Copyright (c) 2012-2021 Faisal Salman <<f@faisalman.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 the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
+The above copyright notice and this permission notice shall be included in all 
 copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
--- a/src/ua-parser.min.js
+++ b/src/ua-parser.min.js
--- a/test/browser-test.json
+++ b/test/browser-test.json
--- a/test/cpu-test.json
+++ b/test/cpu-test.json
@@ -40,69 +40,13 @@
        }
    },
    {
-        "desc"    : "ARM",
-        "ua"      : "Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 635) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMv61",
+        "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"    : "ARMv7",
-        "ua"      : "Mozilla/5.0 (Linux ARMv7) WebKitGTK+/3.4.9 vimprobable2",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMv7l",
-        "ua"      : "Mozilla/5.0 (SMART-TV; X11; Linux armv7l) AppleWebKit/537.42 (KHTML, like Gecko) Chromium/25.0.1349.2 Chrome/25.0.1349.2 Safari/537.42",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMv7l",
-        "ua"      : "Mozilla/5.0 (X11; CrOS armv7l 9765.85.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.123 Safari/537.36",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMEABI",
-        "ua"      : "[FBAN/FB4A;FBAV/237.0.0.44.120;FBBV/170693408;FBDM/{density=1.75,width=720,height=1280};FBLC/en_US;FBRV/172067074;FBCR/ ;FBMF/samsung;FBBD/samsung;FBPN/com.facebook.katana;FBDV/SM-S367VL;FBSV/9;FBBK/1;FBOP/19;FBCA/armeabi-v7a:armeabi;]",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMv8",
-        "ua"      : "Mozilla/5.0 (X11; Linux armv8l; rv:45.0) Gecko/20100101 Firefox/45.0",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
-    {
-        "desc"    : "AARCH64",
-        "ua"      : "Mozilla/5.0 (X11; CrOS aarch64 13310.93.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.133 Safari/537.36",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
    {
        "desc"    : "Pocket PC",
        "ua"      : "Opera/9.7 (Windows Mobile; PPC; Opera Mobi/35166; U; en) Presto/2.2.1",
@@ -143,14 +87,6 @@
            "architecture"  : "sparc"
        }
    },
-    {
-        "desc"    : "sparc64",
-        "ua"      : "ELinks (0.4.3; NetBSD 3.0.2PATCH sparc64; 141x19)",
-        "expect"  :
-        {
-            "architecture"  : "sparc64"
-        }
-    },
    {
        "desc"    : "QuickTime",
        "ua"      : "QuickTime/7.5.6 (qtver=7.5.6;cpu=IA32;os=Mac 10.5.8)",
@@ -168,11 +104,19 @@
        }
    },
    {
-        "desc"    : "IRIX64",
-        "ua"      : "Mozilla/4.8C-SGI [en] (X11; U; IRIX64 6.5 IP27",
-        "expect"  : 
+        "desc"    : "KTB iPad",
+        "ua"      :  "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
+        "expect"  :
        {
-            "architecture"  : "irix64"
+            "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
--- a/test/engine-test.json
+++ b/test/engine-test.json
@@ -1,31 +1,4 @@
 [
-    {
-        "desc"    : "Blink",
-        "ua"      : "Mozilla/5.0 (Linux; Android 7.0; SM-G920I Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/3.4.9 SamsungBrowser/4.0 Chrome/57.0.2987.146 Mobile VR Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Blink",
-            "version" : "57.0.2987.146"
-        }
-    },
-    {
-        "desc"    : "EdgeHTML",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.4; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Safari/537.36 Edge/12.0",
-        "expect"  :
-        {
-            "name"    : "EdgeHTML",
-            "version" : "12.0"
-        }
-    },
-    {
-        "desc"    : "Flow",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_0) EkiohFlow/5.7.4.30559 Flow/5.7.4 (like Gecko Firefox/53.0 rv:53.0)",
-        "expect"  :
-        {
-            "name"    : "Flow",
-            "version" : "5.7.4.30559"
-        }
-    },
    {
        "desc"    : "Gecko",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9pre) Gecko/20110111 Firefox/4.0b9pre",
@@ -35,15 +8,6 @@
            "version" : "2.0b9pre"
        }
    },
-    {
-        "desc"    : "Goanna",
-        "ua"      : "Mozilla/5.0 (Windows NT 5.1; rv:38.9) Gecko/20100101 Goanna/2.2 Firefox/38.9 PaleMoon/26.5.0",
-        "expect"  :
-        {
-            "name"    : "Goanna",
-            "version" : "2.2"
-        }
-    },
    {
        "desc"    : "KHTML",
        "ua"      : "Mozilla/5.0 (compatible; Konqueror/4.5; FreeBSD) KHTML/4.5.4 (like Gecko)",
@@ -99,12 +63,22 @@
        }
    },
    {
-        "desc"    : "WebKit",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/27.0.1453.110 Safari/537.36",
+        "desc"    : "KTA Mobile App",
+        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
        "expect"  :
        {
-            "name"    : "WebKit",
-            "version" : "537.36"
+            "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/mediaplayer-test.json
+++ b/test/mediaplayer-test.json
@@ -1,582 +0,0 @@
-[
-    {
-        "desc"    : "Coremedia",
-        "ua"      : "Apple Mac OS X v10.6.4 CoreMedia v1.0.0.10F2108",
-        "expect"  : 
-        {
-            "name"    : "CoreMedia",
-            "version" : "1.0.0.10F2108",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "AppleCoreMedia",
-        "ua"      : "AppleCoreMedia/1.0.0.10A403 (iPad; U; CPU OS 6_0 like Mac OS X; it_it)",
-        "expect"  : 
-        {
-            "name"    : "AppleCoreMedia",
-            "version" : "1.0.0.10A403",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "AppleTv",
-        "ua"      : "AppleTV/3.0.2 (Macintosh; Intel Mac OS X 10.4.7) AppleWebKit/528.18",
-        "expect"  : 
-        {
-            "name"    : "WebKit",
-            "version" : "528.18",
-            "major"   : "528"
-        }
-    },
-    {
-        "desc"    : "Aqualung",
-        "ua"      : "Aqualung/R-1114",
-        "expect"  : 
-        {
-            "name"    : "Aqualung",
-            "version" : "R-1114",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Ares",
-        "ua"      : "Ares 2.2.4.3048",
-        "expect"  : 
-        {
-            "name"    : "Ares",
-            "version" : "2.2.4.3048",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Audacious",
-        "ua"      : "Audacious/3.2.2 neon/0.29.3",
-        "expect"  : 
-        {
-            "name"    : "Audacious",
-            "version" : "3.2.2",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "AudiMusicStream",
-        "ua"      : "AudiMusicStream/3020.130826151911",
-        "expect"  : 
-        {
-            "name"    : "AudiMusicStream",
-            "version" : "3020.130826151911",
-            "major"   : "3020"
-        }
-    },
-    {
-        "desc"    : "BASS",
-        "ua"      : "BASS/2.4",
-        "expect"  : 
-        {
-            "name"    : "BASS",
-            "version" : "2.4",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "BSPlayer",
-        "ua"      : "BSPlayer/2",
-        "expect"  : 
-        {
-            "name"    : "BSPlayer",
-            "version" : "2",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Core",
-        "ua"      : "CORE/6.506.4.1",
-        "expect"  : 
-        {
-            "name"    : "CORE",
-            "version" : "6.506.4.1",
-            "major"   : "6"
-        }
-    },
-    {
-        "desc"    : "Clementine",
-        "ua"      : "Clementine 1.1",
-        "expect"  : 
-        {
-            "name"    : "Clementine",
-            "version" : "1.1",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Dalvik",
-        "ua"      : "Dalvik/1.2.0 (Linux; U; Android 2.2.1; GT-S5830L Build/FROYO)",
-        "expect"  : 
-        {
-            "name"    : "Dalvik",
-            "version" : "1.2.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "NexPlayer",
-        "ua"      : "E97510d/ Player/NexPlayer 4.0",
-        "expect"  : 
-        {
-            "name"    : "NexPlayer",
-            "version" : "4.0",
-            "major"   : "4"
-        }
-    },
-    {
-        "desc"    : "FLRP",
-        "ua"      : "FLRP/2.5 CFNetwork/609.1.4 Darwin/13.0.0",
-        "expect"  : 
-        {
-            "name"    : "Flip Player",
-            "version" : "2.5",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "FStream",
-        "ua"      : "FStream",
-        "expect"  : 
-        {
-            "name"    : "FStream",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "GStreamer",
-        "ua"      : "GStreamer souphttpsrc (compatible; LG NetCast.TV-2012) libsoup/2.34.2",
-        "expect"  : 
-        {
-            "name"    : "GStreamer",
-            "version" : "2.34.2",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "GnomeMplayer",
-        "ua"      : "GnomeMplayer/1.0.2",
-        "expect"  : 
-        {
-            "name"    : "GnomeMplayer",
-            "version" : "1.0.2",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "HTC Streaming Player",
-        "ua"      : "HTC Streaming Player htc_asia_wwe / 1.0 / endeavoru / 4.1.1",
-        "expect"  : 
-        {
-            "name"    : "HTC Streaming Player",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "HTC One S",
-        "ua"      : "HTC_One_S/3.16.111.10",
-        "expect"  : 
-        {
-            "name"    : "HTC One S",
-            "version" : "3.16.111.10",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "Java",
-        "ua"      : "Java/1.4.1_04",
-        "expect"  : 
-        {
-            "name"    : "Java",
-            "version" : "1.4.1_04",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "LG Player",
-        "ua"      : "LG Player 1.0; Android",
-        "expect"  : 
-        {
-            "name"    : "LG Player",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "NexPlayer",
-        "ua"      : "LG-P700/V10k-DEC-12-2012 Player/NexPlayer 4.0 for Android",
-        "expect"  : 
-        {
-            "name"    : "NexPlayer",
-            "version" : "4.0",
-            "major"   : "4"
-        }
-    },
-    {
-        "desc"    : "LG Player",
-        "ua"      : "LGE400/V10b Player/LG Player 1.0",
-        "expect"  : 
-        {
-            "name"    : "LG Player",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Lavf",
-        "ua"      : "Lavf52.111.0",
-        "expect"  : 
-        {
-            "name"    : "Lavf",
-            "version" : "52.111.0",
-            "major"   : "52"
-        }
-    },
-    {
-        "desc"    : "Lyssna",
-        "ua"      : "Lyssna/46 CFNetwork/609.1.4 Darwin/13.0.0",
-        "expect"  : 
-        {
-            "name"    : "Lyssna",
-            "version" : "46",
-            "major"   : "46"
-        }
-    },
-    {
-        "desc"    : "MPlayer",
-        "ua"      : "MPlayer 1.1-4.2.1",
-        "expect"  : 
-        {
-            "name"    : "MPlayer",
-            "version" : "1.1-4.2.1",
-            "major"   : ""
-        }
-    },
-    {
-        "desc"    : "MPlayer SVN",
-        "ua"      : "MPlayer SVN-r33713-4.6.1",
-        "expect"  : 
-        {
-            "name"    : "MPlayer",
-            "version" : "r33713-4.6.1",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "MPlayer ubuntu",
-        "ua"      : "MPlayer svn r34540 (Ubuntu), built with gcc-4.6",
-        "expect"  : 
-        {
-            "name"    : "MPlayer",
-            "version" : "r34540",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "MoC",
-        "ua"      : "Music On Console/2.5.0-beta1",
-        "expect"  : 
-        {
-            "name"    : "Music On Console",
-            "version" : "2.5.0-beta1",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "MPD",
-        "ua"      : "Music Player Daemon 0.17.4",
-        "expect"  : 
-        {
-            "name"    : "Music Player Daemon",
-            "version" : "0.17.4",
-            "major"   : "0"
-        }
-    },
-    {
-        "desc"    : "NSPlayer",
-        "ua"      : "NSPlayer/11.0.5358.4827 WMFSDK/11.0",
-        "expect"  : 
-        {
-            "name"    : "NSPlayer",
-            "version" : "11.0.5358.4827",
-            "major"   : "11"
-        }
-    },
-    {
-        "desc"    : "Nero Home",
-        "ua"      : "Nero Home/1.5.3.0 (compatible; Nero AG; Nero Home 1.5.3.0)",
-        "expect"  : 
-        {
-            "name"    : "Nero Home",
-            "version" : "1.5.3.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "NexPlayer",
-        "ua"      : "NexPlayer 4.0 for Android( stagefright alternative )",
-        "expect"  : 
-        {
-            "name"    : "NexPlayer",
-            "version" : "4.0",
-            "major"   : "4"
-        }
-    },
-    {
-        "desc"    : "Nokia3xx",
-        "ua"      : "Nokia303/14.87 CLDC-1.1",
-        "expect"  : 
-        {
-            "name"    : "Nokia303",
-            "version" : "14.87",
-            "major"   : "14"
-        }
-    },
-    {
-        "desc"    : "MPlayer SVN Sherpya",
-        "ua"      : "MPlayer Sherpya-SVN-r33124-4.2.5",
-        "expect"  : 
-        {
-            "name"    : "MPlayer",
-            "version" : "r33124-4.2.5",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Philips Songbird",
-        "ua"      : "NotMoz/5.0 (Windows; U; Windows NT 5.1; it; rv:1.9.2.3) Gecko/20101207 Philips-Songbird/5.4.1980 Songbird/1.9.4 (20110302030555)",
-        "expect"  : 
-        {
-            "name"    : "Songbird",
-            "version" : "1.9.4",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Ossproxy",
-        "ua"      : "OSSProxy 1.3.336.320 (Build 336.320 Win32 en-us)(Aug 16 2013 17:38:43)",
-        "expect"  : 
-        {
-            "name"    : "OSSProxy",
-            "version" : "1.3.336.320",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Winamp3",
-        "ua"      : "Nullsoft Winamp3 version 3.0 (compatible)",
-        "expect"  : 
-        {
-            "name"    : "Winamp",
-            "version" : "3.0",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "PSP",
-        "ua"      : "PSP-InternetRadioPlayer/1.00",
-        "expect"  : 
-        {
-            "name"    : "PSP-InternetRadioPlayer",
-            "version" : "1.00",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "urllib",
-        "ua"      : "Python-urllib/2.7",
-        "expect"  : 
-        {
-            "name"    : "Python-urllib",
-            "version" : "2.7",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "QuickTime",
-        "ua"      : "QuickTime/7.5.6 (qtver=7.5.6;cpu=IA32;os=Mac 10.5.8)",
-        "expect"  : 
-        {
-            "name"    : "QuickTime",
-            "version" : "7.5.6",
-            "major"   : "7"
-        }
-    },
-    {
-        "desc"    : "RMA",
-        "ua"      : "RMA/1.0 (compatible; RealMedia)",
-        "expect"  : 
-        {
-            "name"    : "RMA",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "RadioApp",
-        "ua"      : "RadioApp/1.0 CFNetwork/609.1.4 Darwin/11.4.2",
-        "expect"  : 
-        {
-            "name"    : "RadioApp",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "RadioClientApplication",
-        "ua"      : "RadioClientApplication/20 CFNetwork/609.1.4 Darwin/13.0.0",
-        "expect"  : 
-        {
-            "name"    : "RadioClientApplication",
-            "version" : "20",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "stagefright",
-        "ua"      : "Samsung GT-I9070 stagefright/1.1 (Linux;Android 2.3.6)",
-        "expect"  : 
-        {
-            "name"    : "stagefright",
-            "version" : "1.1",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Soundtap",
-        "ua"      : "Soundtap/1.2.4 CFNetwork/672.0.2 Darwin/14.0.0",
-        "expect"  : 
-        {
-            "name"    : "Soundtap",
-            "version" : "1.2.4",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Streamium",
-        "ua"      : "Streamium/1.0",
-        "expect"  : 
-        {
-            "name"    : "Streamium",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Totem",
-        "ua"      : "Totem/3.0.1",
-        "expect"  : 
-        {
-            "name"    : "Totem",
-            "version" : "3.0.1",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "VLC",
-        "ua"      : "VLC media player - version 0.8.6c Janus - (c) 1996-2007 the VideoLAN team",
-        "expect"  : 
-        {
-            "name"    : "VLC",
-            "version" : "0.8.6c",
-            "major"   : "0"
-        }
-    },
-    {
-        "desc"    : "VLC",
-        "ua"      : "VLC/2.0.0 LibVLC/2.0.0",
-        "expect"  : 
-        {
-            "name"    : "VLC",
-            "version" : "2.0.0",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Videos",
-        "ua"      : "Videos/3.8.2",
-        "expect"  : 
-        {
-            "name"    : "Video",
-            "version" : "3.8.2",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "Wget",
-        "ua"      : "Wget/1.12 (darwin10.7.0)",
-        "expect"  : 
-        {
-            "name"    : "Wget",
-            "version" : "1.12",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Winamp",
-        "ua"      : "Winamp 2.81",
-        "expect"  : 
-        {
-            "name"    : "Winamp",
-            "version" : "2.81",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Winamp",
-        "ua"      : "WinampMPEG/2.00",
-        "expect"  : 
-        {
-            "name"    : "Winamp",
-            "version" : "2.00",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Windows Media Player",
-        "ua"      : "Windows-Media-Player/10.00.00.4019",
-        "expect"  : 
-        {
-            "name"    : "Windows Media Player",
-            "version" : "10.00.00.4019",
-            "major"   : "10"
-        }
-    },
-    {
-        "desc"    : "XBMC",
-        "ua"      : "XBMC/12.0 Git:20130127-fb595f2 (Windows NT 6.1;WOW64;Win64;x64; http://www.xbmc.org)",
-        "expect"  : 
-        {
-            "name"    : "XBMC",
-            "version" : "12.0",
-            "major"   : "12"
-        }
-    },
-    {
-        "desc"    : "rad.io",
-        "ua"      : "rad.io 1.18.1 rv:593 (iPhone 4S; iPhone OS 7.0.4; it_IT)",
-        "expect"  : 
-        {
-            "name"    : "rad.io",
-            "version" : "1.18.1",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "BE-Test",
-        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
-        {
-            "name"    : "BE Test",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    }
-]
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -71,15 +71,6 @@
            "version" : "8"
        }
    },
-    {
-        "desc"    : "Windows 10",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "10"
-        }
-    },
    {
        "desc"    : "Windows RT",
        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0)",
@@ -107,15 +98,6 @@
            "version" : "6.1"
        }
    },
-    {
-        "desc"    : "Windows Phone",
-        "ua"      : "Opera/9.80 (Windows Phone; Opera Mini/7.6.8/35.7518; U; ru) Presto/2.8.119 Version/11.10",
-        "expect"  :
-        {
-            "name"    : "Windows Phone",
-            "version" : "undefined"
-        }
-    },
    {
        "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)",
@@ -154,20 +136,11 @@
    },
    {
        "desc"    : "Tizen",
-        "ua"      : "Mozilla/5.0 (SMART-TV; Linux; Tizen 2.3) AppleWebkit/538.1 (KHTML, like Gecko) SamsungBrowser/1.0 TV Safari/538.1",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Tizen",
-            "version" : "2.3"
-        }
-    },
-    {
-        "desc"    : "Tizen",
-        "ua"      : "Mozilla/5.0 (Linux; Tizen 2.3; SAMSUNG SM-Z130H) AppleWebKit/537.3 (KHTML, like Gecko) Version/2.3 Mobile Safari/537.3",
-        "expect"  :
-        {
-            "name"    : "Tizen",
-            "version" : "2.3"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
@@ -180,93 +153,66 @@
        }
    },
    {
-        "desc"    : "Sailfish",
-        "ua"      : "Mozilla/5.0 (Linux; U; Sailfish 3.0; Mobile; rv:45.0) Gecko/45.0 Firefox/45.0 SailfishBrowser/1.0",
+        "desc"    : "WebOS",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Sailfish",
-            "version" : "3.0"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
-        "desc"    : "WebOS",
-        "ua"      : "Mozilla/5.0 (hp-tablet; Linux; hpwOS/3.0.5; U; en-US) AppleWebKit/534.6 (KHTML, like Gecko) wOSBrowser/234.83 Safari/534.6 TouchPad/1.0",
+        "desc"    : "Palm OS",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "webOS",
-            "version" : "3.0.5"
-        }
-    },
-    {
-        "desc"    : "WebOS",
-        "ua"      : "Mozilla/5.0 (webOS/1.4.5; U; en-US) AppleWebKit/532.2 (KHTML, like Gecko) Version/1.0 Safari/532.2 Pre/1.0",
-        "expect"  :
-        {
-            "name"    : "webOS",
-            "version" : "1.4.5"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "QNX",
-        "ua"      : "Mozilla/5.0 (Photon; U; QNX x86pc; en-US; rv:1.8.1.20) Gecko/20090127 BonEcho/2.0.0.20",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "QNX",
-            "version" : "x86pc"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "Bada",
-        "ua"      : "Mozilla/5.0 (SAMSUNG; SAMSUNG-GT-S5253/S5253DDKC1; U; Bada/1.0; en-us) AppleWebKit/533.1 (KHTML, like Gecko) Dolfin/2.0 Mobile WQVGA SMM-MMS/1.2.0 OPN-B",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Bada",
-            "version" : "1.0"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "RIM Tablet OS",
-        "ua"      : "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/7.2.1.0 Safari/536.2+",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "RIM Tablet OS",
-            "version" : "2.1.0"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "MeeGo",
-        "ua"      : "Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "MeeGo",
-            "version" : "undefined"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "Symbian",
-        "ua"      : "Nokia5250/10.0.011 (SymbianOS/9.4; U; Series60/5.0 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/525 (KHTML, like Gecko) Safari/525 3gpp-gba",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Symbian",
-            "version" : "9.4"
-        }
-    },
-    {
-        "desc"    : "Symbian",
-        "ua"      : "Mozilla/5.0 (Symbian/3; Series60/5.2 NokiaC7-00/024.001; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/533.4 (KHTML, like Gecko) NokiaBrowser/7.3.1.37 Mobile Safari/533.4 3gpp-gba",
-        "expect"  :
-        {
-            "name"    : "Symbian",
-            "version" : "5.2"
-        }
-    },
-    {
-        "desc"    : "Series40",
-        "ua"      : "Mozilla/5.0 (Series40; Nokia2055/03.20; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/2.2.0.0.34",
-        "expect"  :
-        {
-            "name"    : "Series40",
-            "version" : "undefined"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
@@ -279,228 +225,84 @@
        }
    },
    {
-        "desc"    : "Google Chromecast",
-        "ua"      : "Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.81 Safari/537.36 CrKey/1.42.183786",
+        "desc"    : "Nintendo",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Chromecast",
-            "version" : "1.42.183786"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
-        "desc"    : "Nintendo Switch",
-        "ua"      : "Mozilla/5.0 (Nintendo Switch; WifiWebAuthApplet) AppleWebKit/606.4 (KHTML, like Gecko) NF/6.0.1.15.4 NintendoBrowser/5.1.0.20393",
+        "desc"    : "PlayStation",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Nintendo",
-            "version" : "Switch"
-        }
-    },
-    {
-        "desc"    : "PlayStation 4",
-        "ua"      : "Mozilla/5.0 (PlayStation 4 3.00) AppleWebKit/537.73 (KHTML, like Gecko)",
-        "expect"  :
-        {
-            "name"    : "PlayStation",
-            "version" : "4"
-        }
-    },
-    {
-        "desc"    : "Xbox 360",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox 360) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Xbox",
-            "version" : "360"
-        }
-    },
-    {
-        "desc"    : "Xbox One",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox One; WebView/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.19041",
-        "expect"  :
-        {
-            "name"    : "Xbox",
-            "version" : "One"
-        }
-    },
-    {
-        "desc"    : "Xbox X",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02",
-        "expect"  :
-        {
-            "name"    : "Xbox",
-            "version" : "X"
-        }
-    },
-    {
-        "desc"    : "Xbox Series X",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox Series X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02 ",
-        "expect"  :
-        {
-            "name"    : "Xbox",
-            "version" : "Series X"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "Mint",
-        "ua"      : "Opera/9.80 (X11; Linux x86_64; Edition Linux Mint) Presto/2.12.388 Version/12.16",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Mint",
-            "version" : "undefined"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
-        "desc"    : "Mint",
-        "ua"      : "Opera/9.64 (X11; Linux i686; U; Linux Mint; nb) Presto/2.1.1",
+        "desc"    : "Joli",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Mint",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.5) Gecko/2008121622 Linux Mint/6 (Felicia) Firefox/3.0.4",
-        "expect"  :
-        {
-            "name"    : "Mint",
-            "version" : "6"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "Ubuntu",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.22+ (KHTML, like Gecko) Chromium/17.0.963.56 Chrome/17.0.963.56 Safari/535.22+ Ubuntu/12.04 (3.4.1-0ubuntu1) Epiphany/3.4.1",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Ubuntu",
-            "version" : "12.04"
-        }
-    },
-    {
-        "desc"    : "Ubuntu",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/31.0.1650.63 Chrome/31.0.1650.63 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Ubuntu",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Kubuntu",
-        "ua"      : "Mozilla/5.0 (compatible; Konqueror/4.4; Linux 2.6.32-22-generic; X11; en_US) KHTML/4.4.3 (like Gecko) Kubuntu",
-        "expect"  :
-        {
-            "name"    : "Kubuntu",
-            "version" : "undefined"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "Debian",
-        "ua"      : "Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.7 (like Gecko) (Debian)",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Debian",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Debian",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; Debian GNU/Linux 8.1 (jessie)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.0 Maxthon/1.0.5.3 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Debian",
-            "version" : "8.1"
-        }
-    },
-    {
-        "desc"    : "Debian",
-        "ua"      : "ELinks/0.12~pre5-4 (textmode; Debian; Linux 3.2.0-4-amd64 x86_64 192x47-2)",
-        "expect"  :
-        {
-            "name"    : "Debian",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Debian",
-        "ua"      : "w3m/0.5.3+debian-19",
-        "expect"  :
-        {
-            "name"    : "debian",
-            "version" : "19"
-        }
-    },
-    {
-        "desc"    : "Debian",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.0.3) Gecko/2008092814 (Debian-3.0.1-1)",
-        "expect"  :
-        {
-            "name"    : "Debian",
-            "version" : "3.0.1-1"
-        }
-    },
-    {
-        "desc"    : "Debian",
-        "ua"      : "Mozilla/5.0 (compatible; Konqueror/3.5; Linux 2.6.24.4; X11) KHTML/3.5.9 (like Gecko) (Debian package 4:3.5.9.dfsg.1-2+b1)",
-        "expect"  :
-        {
-            "name"    : "Debian",
-            "version" : "undefined"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "OpenSUSE",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110420 SUSE/3.6.17-0.2.1 Firefox/3.6.17",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "SUSE",
-            "version" : "3.6.17-0.2.1"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "Gentoo",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.16) Gecko/20080716 (Gentoo) Galeon/2.0.6",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Gentoo",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Gentoo",
-        "ua"      : "Xombrero (X11; U; Gentoo Linux amd64; en-US) Webkit/2.8.5",
-        "expect"  :
-        {
-            "name"    : "Gentoo",
-            "version" : "amd64"
-        }
-    },
-    {
-        "desc"    : "Gentoo",
-        "ua"      : "Xombrero/1.6.4 (Linux amd64; en; Gentoo)",
-        "expect"  :
-        {
-            "name"    : "Gentoo",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Gentoo",
-        "ua"      : "Links (2.8; Linux 3.17.2-gentoo-x86 i686; GNU C 4.8.2; x)",
-        "expect"  :
-        {
-            "name"    : "gentoo",
-            "version" : "x86"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "Arch",
-        "ua"      : "Uzbl (Webkit 1.1.10) (Arch Linux)",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Arch",
-            "version" : "undefined"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
@@ -514,56 +316,92 @@
    },
    {
        "desc"    : "Fedora",
-        "ua"      : "Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:40.0) Gecko/20100101 Firefox/40.0",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Fedora",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Fedora",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-GB; rv:2.0) Gecko/20110404 Fedora/16-dev Firefox/4.0",
-        "expect"  :
-        {
-            "name"    : "Fedora",
-            "version" : "16-dev"
-        }
-    },
-    {
-        "desc"    : "Fedora",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; sk; rv:1.9.0.4) Gecko/2008111217 Fedora/3.0.4-1.fc10 Firefox/3.0.4",
-        "expect"  :
-        {
-            "name"    : "Fedora",
-            "version" : "3.0.4-1.fc10"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "Mandriva",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.22) Gecko/20110907 Mandriva Linux/1.9.2.22-0.1mdv2010.2 (2010.2) Firefox/3.6.22",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Mandriva",
-            "version" : "1.9.2.22-0.1mdv2010.2"
+            "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"      : "Mozilla/5.0 (X11; CrOS x86_64 10575.58.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Chromium OS",
-            "version" : "10575.58.0"
-        }
-    },
-    {
-        "desc"    : "Fuchsia",
-        "ua"      : "Mozilla/5.0 (X11; Fuchsia x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3557.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Fuchsia",
-            "version" : "undefined"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
@@ -577,29 +415,29 @@
    },
    {
        "desc"    : "FreeBSD",
-        "ua"      : "Mozilla/5.0 (X11; U; FreeBSD x86_64; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "FreeBSD",
-            "version" : "undefined"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "OpenBSD",
-        "ua"      : "Mozilla/5.0 (X11; U; OpenBSD i386; en-US; rv:1.9.1) Gecko/20090702 Firefox/3.5",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "OpenBSD",
-            "version" : "undefined"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
        "desc"    : "NetBSD",
-        "ua"      : "ELinks (0.4.3; NetBSD 3.0.2PATCH sparc64; 141x19)",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "NetBSD",
-            "version" : "3.0.2PATCH"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
@@ -611,15 +449,6 @@
            "version" : ""
        }
    },
-    {
-        "desc"    : "iOS in App",
-        "ua"      : "AppName/version CFNetwork/version Darwin/version",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "undefined"
-        }
-    },
    {
        "desc"    : "iOS with Chrome",
        "ua"      : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",
@@ -643,80 +472,17 @@
        "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",
+            "name"    : "Mac OS X",
            "version" : "10.6.8"
        }
    },
    {
        "desc"    : "Haiku",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Haiku R1 x86) AppleWebKit/602.1.1 (KHTML, like Gecko) WebPositive/1.2 Version/8.0 Safari/602.1.1",
+        "ua"      : "",
        "expect"  :
        {
-            "name"    : "Haiku",
-            "version" : "R1"
-        }
-    },
-    {
-        "desc"    : "KaiOS",
-        "ua"      : "Mozilla/5.0 (Mobile; Nokia_8110_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5",
-        "expect"  :
-        {
-            "name"    : "KAIOS",
-            "version" : "2.5"
-        }
-    },
-    {
-        "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"    : "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"
-        }
-    },
-    {
-        "desc"    : "Solaris",
-        "ua"      : "NCSA Mosaic/1.0 (X11;SunOS 4.1.4 sun4m)",
-        "expect"  :
-        {
-            "name"    : "Solaris",
-            "version" : "4.1.4"
-        }
-    },
-    {
-        "desc"    : "Raspbian",
-        "ua"      : "Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Raspbian Chromium/72.0.3626.121 HeadlessChrome/72.0.3626.121 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Raspbian",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Raspbian",
-        "ua"      : "Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/538.15 (KHTML, like Gecko) Version/8.0 Safari/538.15 Raspbian/9.0 (1:3.8.2.0-0rpi28) Epiphany/3.8.2",
-        "expect"  :
-        {
-            "name"    : "Raspbian",
-            "version" : "9.0"
+            "name"    : "",
+            "version" : ""
        }
    },
    {
@@ -792,7 +558,16 @@
        }
    },
    {
-        "desc"    : "Joli",
+        "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"  :
        {
@@ -801,75 +576,21 @@
        }
    },
    {
-        "desc"    : "CentOS",
-        "ua"      : "",
+        "desc"    : "iOS BE App",
+        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
        "expect"  :
        {
-            "name"    : "",
-            "version" : ""
+            "name"    : "iOS",
+            "version" : "7.0.2"
        }
    },
    {
-        "desc"    : "PCLinuxOS",
-        "ua"      : "",
+        "desc"    : "KTB-Nexus 5",
+        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
        "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"    : "Palm OS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
+            "name"    : "Android",
+            "version" : "4.2.1"
        }
    }
 ]
--- a/test/test.js
+++ b/test/test.js
--- a/ua-parser-js.jquery.json
+++ b/ua-parser-js.jquery.json
@@ -0,0 +1,32 @@
+{
+    "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"
+}