diff --git a/common/framework/ua.php b/common/framework/ua.php
index d2b9010ad..b9cf7728b 100644
--- a/common/framework/ua.php
+++ b/common/framework/ua.php
@@ -173,6 +173,7 @@ class UA
 			'os' => null,
 			'is_mobile' => null,
 			'is_tablet' => null,
+			'is_robot' => null,
 		);
 		if (is_null($ua))
 		{
@@ -180,29 +181,40 @@ class UA
 		}
 		
 		// Try to guess the OS.
-		if (preg_match('#(Windows|Android|Linux|iOS|OS X|Macintosh)#i', $ua, $matches))
+		if (preg_match('#(Windows|Android|Linux|i(?:Phone|P[ao]d)|OS X|Macintosh)#i', $ua, $matches))
 		{
 			if ($matches[1] === 'Linux' && strpos($ua, 'Android') !== false)
 			{
-				$matches[1] = 'Android';
+				$result->os = 'Android';
 			}
-			if ($matches[1] === 'Macintosh' && strpos($ua, 'OS X') !== false)
+			elseif ($matches[1] === 'iPhone' || $matches[1] === 'iPad' || $matches[1] === 'iPod')
 			{
-				$matches[1] = 'OS X';
+				$result->os = 'iOS';
+			}
+			elseif ($matches[1] === 'Macintosh' && strpos($ua, 'OS X') !== false)
+			{
+				$result->os = 'OS X';
+			}
+			else
+			{
+				$result->os = $matches[1];
 			}
-			$result->os = $matches[1];
 		}
 		
 		// Fill in miscellaneous fields.
 		$result->is_mobile = self::isMobile($ua);
 		$result->is_tablet = self::isTablet($ua);
+		$result->is_robot = self::isRobot($ua);
 		
 		// Try to match some of the most common browsers.
-		if (preg_match('#Android ([0-9]+\\.[0-9]+)#', $ua, $matches) && strpos($ua, 'Chrome') === false)
+		if ($result->os === 'Android' && preg_match('#Android ([0-9]+\\.[0-9]+)#', $ua, $matches))
 		{
-			$result->browser = 'Android';
-			$result->version = $matches[1];
-			return $result;
+			if (strpos($ua, 'Chrome') === false || preg_match('#(?:Version|Browser)/[0-9]+#', $ua) || preg_match('#\\bwv\\b#', $ua))
+			{
+				$result->browser = 'Android';
+				$result->version = $matches[1];
+				return $result;
+			}
 		}
 		if (preg_match('#Edge/([0-9]+\\.)#', $ua, $matches))
 		{
@@ -216,12 +228,33 @@ class UA
 			$result->version = ($matches[1] + 4) . '.0';
 			return $result;
 		}
-		if (preg_match('#(MSIE|Chrome|Firefox|Safari)[ /:]([0-9]+\\.[0-9]+)#', $ua, $matches))
+		if (preg_match('#(MSIE|Chrome|CriOS|Firefox|FxiOS|Yeti|[a-z]+bot(?:-Image)?)[ /:]([0-9]+\\.[0-9]+)#i', $ua, $matches))
 		{
-			$result->browser = $matches[1] === 'MSIE' ? 'IE' : $matches[1];
+			if ($matches[1] === 'MSIE')
+			{
+				$result->browser = 'IE';
+			}
+			elseif ($matches[1] === 'CriOS')
+			{
+				$result->browser = 'Chrome';
+			}
+			elseif ($matches[1] === 'FxiOS')
+			{
+				$result->browser = 'Firefox';
+			}
+			else
+			{
+				$result->browser = ucfirst($matches[1]);
+			}
 			$result->version = $matches[2];
 			return $result;
 		}
+		if (preg_match('#Safari/[0-9]+#', $ua) && preg_match('#Version/([0-9]+\\.[0-9]+)#', $ua, $matches) && $matches[1] < 500)
+		{
+			$result->browser = 'Safari';
+			$result->version = $matches[1];
+			return $result;
+		}
 		if (preg_match('#^Opera/.+(?:Opera |Version/)([0-9]+\\.[0-9]+)$#', $ua, $matches))
 		{
 			$result->browser = 'Opera';
diff --git a/tests/unit/framework/UATest.php b/tests/unit/framework/UATest.php
index ca2a6f03e..7c5c48666 100644
--- a/tests/unit/framework/UATest.php
+++ b/tests/unit/framework/UATest.php
@@ -56,8 +56,25 @@ class UATest extends \Codeception\TestCase\Test
 		$this->assertEquals('Android', $browser->os);
 		$this->assertTrue($browser->is_mobile);
 		$this->assertTrue($browser->is_tablet);
+		$this->assertFalse($browser->is_robot);
 		
-		// Mobile Chrome
+		// Android default browser (possible confusion with Chrome)
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Linux; Android 4.4.4; One Build/KTU84L.H4) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/33.0.0.0 Mobile Safari/537.36');
+		$this->assertEquals('Android', $browser->browser);
+		$this->assertEquals('4.4', $browser->version);
+		$this->assertTrue($browser->is_mobile);
+		$this->assertFalse($browser->is_tablet);
+		$this->assertFalse($browser->is_robot);
+		
+		// Android webview (possible confusion with Chrome)
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Linux; Android 5.1.1; Nexus 5 Build/LMY48B; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.65 Mobile Safari/537.36');
+		$this->assertEquals('Android', $browser->browser);
+		$this->assertEquals('5.1', $browser->version);
+		$this->assertTrue($browser->is_mobile);
+		$this->assertFalse($browser->is_tablet);
+		$this->assertFalse($browser->is_robot);
+		
+		// Android Chrome
 		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Linux; Android 5.0; Nexus 5 Build/LPX13D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.102 Mobile Safari/537.36');
 		$this->assertEquals('Chrome', $browser->browser);
 		$this->assertEquals('38.0', $browser->version);
@@ -65,13 +82,26 @@ class UATest extends \Codeception\TestCase\Test
 		$this->assertTrue($browser->is_mobile);
 		$this->assertFalse($browser->is_tablet);
 		
-		// Edge
+		// Windows Chrome
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36');
+		$this->assertEquals('Chrome', $browser->browser);
+		$this->assertEquals('51.0', $browser->version);
+		$this->assertEquals('Windows', $browser->os);
+		$this->assertFalse($browser->is_mobile);
+		
+		// Edge 13
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Safari/537.36 Edge/13.10586');
+		$this->assertEquals('Edge', $browser->browser);
+		$this->assertEquals('13.0', $browser->version);
+		$this->assertEquals('Windows', $browser->os);
+		$this->assertFalse($browser->is_mobile);
+		
+		// Edge 12
 		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10136');
 		$this->assertEquals('Edge', $browser->browser);
 		$this->assertEquals('12.0', $browser->version);
 		$this->assertEquals('Windows', $browser->os);
 		$this->assertFalse($browser->is_mobile);
-		$this->assertFalse($browser->is_tablet);
 		
 		// IE 11
 		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko');
@@ -84,6 +114,11 @@ class UATest extends \Codeception\TestCase\Test
 		$this->assertEquals('IE', $browser->browser);
 		$this->assertEquals('10.0', $browser->version);
 		
+		// IE 9
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET CLR 2.0.50727; Media Center PC 6.0)');
+		$this->assertEquals('IE', $browser->browser);
+		$this->assertEquals('9.0', $browser->version);
+		
 		// IE 8 in compatibility mode
 		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0)');
 		$this->assertEquals('IE', $browser->browser);
@@ -94,11 +129,81 @@ class UATest extends \Codeception\TestCase\Test
 		$this->assertEquals('Chrome', $browser->browser);
 		$this->assertEquals('41.0', $browser->version);
 		$this->assertEquals('Linux', $browser->os);
+		$this->assertFalse($browser->is_mobile);
+		
+		// Linux Konqueror
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (X11; Linux) KHTML/4.9.1 (like Gecko) Konqueror/4.9');
+		$this->assertEquals('Konqueror', $browser->browser);
+		$this->assertEquals('4.9', $browser->version);
+		$this->assertEquals('Linux', $browser->os);
+		
+		// iOS Safari
+		$browser = Rhymix\Framework\UA::getBrowserInfo('iPad: Mozilla/5.0 (iPad; CPU OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B176 Safari/7534.48.3');
+		$this->assertEquals('Safari', $browser->browser);
+		$this->assertEquals('5.1', $browser->version);
+		$this->assertEquals('iOS', $browser->os);
+		$this->assertTrue($browser->is_mobile);
+		$this->assertTrue($browser->is_tablet);
+		
+		// iOS Chrome
+		$browser = Rhymix\Framework\UA::getBrowserInfo('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');
+		$this->assertEquals('Chrome', $browser->browser);
+		$this->assertEquals('19.0', $browser->version);
+		$this->assertEquals('iOS', $browser->os);
+		$this->assertTrue($browser->is_mobile);
+		$this->assertFalse($browser->is_tablet);
+		
+		// iOS Firefox
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (iPad; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/1.0 Mobile/12F69 Safari/600.1.4');
+		$this->assertEquals('Firefox', $browser->browser);
+		$this->assertEquals('1.0', $browser->version);
+		$this->assertEquals('iOS', $browser->os);
+		$this->assertTrue($browser->is_mobile);
+		$this->assertTrue($browser->is_tablet);
+		
+		// OS X Safari
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_2) AppleWebKit/600.3.18 (KHTML, like Gecko) Version/8.0.3 Safari/600.3.18');
+		$this->assertEquals('Safari', $browser->browser);
+		$this->assertEquals('8.0', $browser->version);
+		$this->assertEquals('OS X', $browser->os);
+		$this->assertFalse($browser->is_mobile);
+		
+		// OS X Chrome
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36');
+		$this->assertEquals('Chrome', $browser->browser);
+		$this->assertEquals('41.0', $browser->version);
+		$this->assertEquals('OS X', $browser->os);
+		$this->assertFalse($browser->is_mobile);
 		
 		// OS X Firefox
 		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10; rv:33.0) Gecko/20100101 Firefox/33.0');
 		$this->assertEquals('Firefox', $browser->browser);
 		$this->assertEquals('33.0', $browser->version);
 		$this->assertEquals('OS X', $browser->os);
+		$this->assertFalse($browser->is_mobile);
+		
+		// Googlebot
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)');
+		$this->assertEquals('Googlebot', $browser->browser);
+		$this->assertEquals('2.1', $browser->version);
+		$this->assertTrue($browser->is_robot);
+		
+		// Googlebot-Image
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Googlebot-Image/1.0');
+		$this->assertEquals('Googlebot-Image', $browser->browser);
+		$this->assertEquals('1.0', $browser->version);
+		$this->assertTrue($browser->is_robot);
+		
+		// Bingbot
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)');
+		$this->assertEquals('Bingbot', $browser->browser);
+		$this->assertEquals('2.0', $browser->version);
+		$this->assertTrue($browser->is_robot);
+		
+		// Yeti
+		$browser = Rhymix\Framework\UA::getBrowserInfo('Yeti/1.0 (+http://help.naver.com/robots/)');
+		$this->assertEquals('Yeti', $browser->browser);
+		$this->assertEquals('1.0', $browser->version);
+		$this->assertTrue($browser->is_robot);
 	}
 }