diff --git a/classes/Guest.php b/classes/Guest.php
index 1db077983..688cf95dd 100644
--- a/classes/Guest.php
+++ b/classes/Guest.php
@@ -102,14 +102,16 @@ class GuestCore extends ObjectModel
 	protected function getBrowser($userAgent)
 	{
 		$browserArray = array(
-			'Google Chrome' => 'Chrome/',
+			'Chrome' => 'Chrome/',
 			'Safari' => 'Safari',
-			'Firefox 3.x' => 'Firefox/3',
-			'Firefox 2.x' => 'Firefox/2',
+			'Safari iPad' => 'iPad',
+			'Firefox' => 'Firefox/',
 			'Opera' => 'Opera',
-			'IE 8.x' => 'MSIE 8',
-			'IE 7.x' => 'MSIE 7',
-			'IE 6.x' => 'MSIE 6'
+			'IE 10' => 'MSIE 10',
+			'IE 9' => 'MSIE 9',
+			'IE 8' => 'MSIE 8',
+			'IE 7' => 'MSIE 7',
+			'IE 6' => 'MSIE 6'
 		);
 		foreach ($browserArray as $k => $value)
 			if (strstr($userAgent, $value))
@@ -127,9 +129,12 @@ class GuestCore extends ObjectModel
 	protected function getOs($userAgent)
 	{
 		$osArray = array(
-			'Windows Vista' => 'Windows NT 6',
+			'Windows 8' => 'Windows NT 6.2',
+			'Windows 7' => 'Windows NT 6.1',
+			'Windows Vista' => 'Windows NT 6.0',
 			'Windows XP' => 'Windows NT 5',
 			'MacOsX' => 'Mac OS X',
+			'Android' => 'Android',
 			'Linux' => 'X11'
 		);
 		foreach ($osArray as $k => $value)
diff --git a/install-dev/data/xml/operating_system.xml b/install-dev/data/xml/operating_system.xml
index d77191e76..0844133ff 100644
--- a/install-dev/data/xml/operating_system.xml
+++ b/install-dev/data/xml/operating_system.xml
@@ -10,11 +10,20 @@
     <operating_system id="Windows_Vista">
       <name>Windows Vista</name>
     </operating_system>
+    <operating_system id="Windows_7">
+      <name>Windows 7</name>
+    </operating_system>
+    <operating_system id="Windows_8">
+      <name>Windows 8</name>
+    </operating_system>
     <operating_system id="MacOsX">
       <name>MacOsX</name>
     </operating_system>
     <operating_system id="Linux">
       <name>Linux</name>
     </operating_system>
+    <operating_system id="Android">
+      <name>Android</name>
+    </operating_system>
   </entities>
 </entity_operating_system>
diff --git a/install-dev/data/xml/web_browser.xml b/install-dev/data/xml/web_browser.xml
index 4d31db30f..7bebdb311 100644
--- a/install-dev/data/xml/web_browser.xml
+++ b/install-dev/data/xml/web_browser.xml
@@ -7,26 +7,32 @@
     <web_browser id="Safari">
       <name>Safari</name>
     </web_browser>
-    <web_browser id="Firefox_2_x">
-      <name>Firefox 2.x</name>
+    <web_browser id="Safari_ipad">
+      <name>Safari iPad</name>
     </web_browser>
-    <web_browser id="Firefox_3_x">
-      <name>Firefox 3.x</name>
+    <web_browser id="Firefox">
+      <name>Firefox</name>
     </web_browser>
     <web_browser id="Opera">
       <name>Opera</name>
     </web_browser>
-    <web_browser id="IE_6_x">
-      <name>IE 6.x</name>
+    <web_browser id="IE_6">
+      <name>IE 6</name>
     </web_browser>
-    <web_browser id="IE_7_x">
-      <name>IE 7.x</name>
+    <web_browser id="IE_7">
+      <name>IE 7</name>
     </web_browser>
-    <web_browser id="IE_8_x">
-      <name>IE 8.x</name>
+    <web_browser id="IE_8">
+      <name>IE 8</name>
     </web_browser>
-    <web_browser id="Google_Chrome">
-      <name>Google Chrome</name>
+    <web_browser id="IE_9">
+      <name>IE 9</name>
+    </web_browser>
+    <web_browser id="IE_10">
+      <name>IE 10</name>
+    </web_browser>
+    <web_browser id="Chrome">
+      <name>Chrome</name>
     </web_browser>
   </entities>
 </entity_web_browser>