diff --git a/.gitignore b/.gitignore
index 6f18eba..ab50210 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 node_modules/
 npm-debug.log
-<<<<<<< HEAD
 ### vim ###
 .*.s[a-w][a-z]
 *.un~
@@ -21,6 +20,4 @@ Icon
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
-=======
 .idea
->>>>>>> baf4bb99b4ef92c71419931e8fd334e34c051e52
diff --git a/bower.json b/bower.json
index 5df1992..e4dbcfa 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "ua-parser-js",
-    "version": "0.6.3-ktb",
+    "version": "0.7.0",
     "authors": [
         "Faisal Salman <fyzlman@gmail.com>"
     ],
@@ -15,10 +15,23 @@
     ],
     "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>"
+        "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": {
 
diff --git a/component.json b/component.json
index e73ebd8..510b80f 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "ua-parser-js",
-  "version": "0.6.16",
+  "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"],
diff --git a/package.json b/package.json
index 45c2b1e..383dc28 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "title": "UAParser.js",
   "name": "ua-parser-js",
-  "version": "0.6.16",
+  "version": "0.7.0",
   "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
   "description": "Lightweight JavaScript-based user-agent string parser",
   "keywords": [
@@ -16,10 +16,23 @@
   "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>"
+    "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>"
   ],
   "main": "src/ua-parser.js",
   "scripts": {
diff --git a/src/ua-parser.js b/src/ua-parser.js
index d7081ec..2f40bcf 100644
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -1,4 +1,4 @@
-// UAParser.js v0.6.16
+// UAParser.js v0.7.0
 // Lightweight JavaScript-based User-Agent string parser
 // https://github.com/faisalman/ua-parser-js
 //
diff --git a/ua-parser-js.jquery.json b/ua-parser-js.jquery.json
index d21929f..618cedf 100644
--- a/ua-parser-js.jquery.json
+++ b/ua-parser-js.jquery.json
@@ -1,7 +1,7 @@
 {
     "title": "UAParser.js",
     "name": "ua-parser-js",
-    "version": "0.6.16",
+    "version": "0.7.0",
     "description": "Lightweight JavaScript-based user-agent string parser",
     "keywords": [
         "user-agent",