diff --git a/drivers/bookmarklet/images/icons/Snoobi.png b/drivers/bookmarklet/images/icons/Snoobi.png
index c1c900721..0f046cb82 100644
Binary files a/drivers/bookmarklet/images/icons/Snoobi.png and b/drivers/bookmarklet/images/icons/Snoobi.png differ
diff --git a/drivers/bookmarklet/js/wappalyzer.js b/drivers/bookmarklet/js/wappalyzer.js
index 92a829f4a..5d1631368 100644
--- a/drivers/bookmarklet/js/wappalyzer.js
+++ b/drivers/bookmarklet/js/wappalyzer.js
@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;
diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index 9c56b4c9a..0348fdb27 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -30,7 +30,8 @@
 		"28": "operating-systems",
 		"29": "search-engines",
 		"30": "web-mail",
-		"31": "cdn"
+		"31": "cdn",
+		"32": "marketing-automation"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -96,6 +97,10 @@
 			"env": "amp_js_init",
 			"implies": [ "PHP" ]
 		},
+		"AngularJS": {
+			"cats": [ 12 ],
+			"env": "^angular$"
+		},
 		"AOLserver": {
 			"cats": [ 22 ],
 			"headers": { "Server": "AOLserver" } },
@@ -225,6 +230,10 @@
 		"CFML": {
 			"cats": [ 27 ]
 		},
+		"CacheFly": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
+		},
 		"Chameleon": {
 			"cats": [ 1 ],
 			"meta": { "generator": "chameleon-cms" },
@@ -468,8 +477,9 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ 1 ],
+			"cats": [ "1" ],
 			"meta": { "generator": "DotNetNuke" },
+			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -506,6 +516,10 @@
 			"script": "e107\\.js",
 			"implies": [ "PHP"]
 		},
+		"EdgeCast": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^ECS " }
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -539,7 +553,7 @@
 		"eZ Publish": {
 			"cats": [ 1, 6 ],
 			"meta": { "generator": "eZ Publish" },
-			"headers": {  "X-Powered-By": "^eZ Publish$" },
+			"headers": {  "X-Powered-By": "^eZ Publish" },
 			"implies": [ "PHP" ]
 		},
 		"Fact Finder": {
@@ -622,6 +636,10 @@
 			"cats": [ 22 ],
 			"headers": { "Server": "Google Frontend" }
 		},
+		"Google Code Prettify": {
+			"cats": [ 19 ],
+			"env": "^prettyPrint$"
+		},
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
@@ -636,6 +654,14 @@
 			"cats": [ 1 ],
 			"url": "sites.google.com"
 		},
+		"Google Tag Manager": {
+			"cats": [ 19 ],
+			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+		},
+		"Google Web Toolkit": {
+			"cats": [ 18 ],
+			"env": "^__gwt_"
+		},
 		"GoStats": {
 			"cats": [ 10 ],
 			"env": "^_go(stats|_track)"
@@ -653,6 +679,10 @@
 			"html": "gravityInsightsParams\\.site_guid = '",
 			"env": "^GravityInsights$"
 		},
+		"GX WebManager": {
+			"cats": [ 1 ],
+			"meta": { "generator": "GX WebManager" }
+		},
 		"Handlebars": {
 			"cats": [ 12 ],
 			"env": "^Handlebars$"
@@ -672,7 +702,7 @@
 		},
 		"Hybris": {
 			"cats": [ 6 ],
-			"html": "/sys_master/|/hybr/",
+			"html": "(/sys_master/|/hybr/|/_ui/desktop/)",
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
@@ -730,7 +760,7 @@
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "iWeb" }
+			"meta": { "generator": "^iWeb" }
 		},
 		"Jalios": {
 			"cats": [ 1 ],
@@ -745,6 +775,11 @@
 			"script": "jit.*\\.js",
 			"env": "^\\$jit$"
 		},
+		"Jirafe": {
+			"cats": [ 10, 32 ],
+			"script": "/jirafe\\.js",
+			"env": "^jirafe$"
+		},
 		"Jo": {
 			"cats": [ 26, 12 ],
 			"env": "^jo(Cache|DOM|Event)$"
@@ -758,7 +793,7 @@
 			"cats": [ 1 ],
 			"url": "option=com_",
 			"meta": { "generator": "Joomla" },
-			"html": "(<!-- JoomlaWorks \\\"K2\\\"|<[^>]+(feed|components)/com_)",
+			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill\\\")",
 			"headers": { "X-Content-Encoded-By": "Joomla" },
 			"env": "^(jcomments)$"
 		},
@@ -878,6 +913,11 @@
 			"cats": [ 13 ],
 			"html": "<img[^>]+ alt=\\\"Powered by Mantis Bugtracker"
 		},
+		"Marketo": {
+			"cats": [ 32 ],
+			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
+			"env": "^Munchkin$"
+		},
 		"MaxSite CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "MaxSite CMS" }
@@ -999,6 +1039,11 @@
 			"script": "netmonitor\\.fi/nmtracker\\.js",
 			"env": "^netmonitor"
 		},
+		"New Relic": {
+			"cats": [ 10 ],
+			"html": "<script[^>]+>var NREUMQ=NREUMQ",
+			"env": "^NREUMQ$"
+		},
 		"Nginx": {
 			"cats": [ 22 ],
 			"headers": { "Server": "nginx" }
@@ -1014,13 +1059,19 @@
 			"cats": [ 6 ],
 			"html": "(<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
 		},
+		"Open Web Analytics": {
+			"cats": [ 10 ],
+			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
+			"env": "^_?owa_"
+		},
 		"OneStat": {
 			"cats": [ 10 ],
 			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route)"
+			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"implies": [ "PHP" ]
 		},
 		"openEngine": {
 			"cats": [ 1 ],
@@ -1040,10 +1091,10 @@
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
-		"Open Web Analytics": {
-			"cats": [ 10 ],
-			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
-			"env": "^_?owa_"
+		"OpenText Web Solutions": {
+			"cats": [ 1 ],
+			"html": "<!--[^>]+published by Open Text Web Solutions",
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"Optimizely": {
 			"cats": [ 10 ],
@@ -1132,6 +1183,11 @@
 			"cats": [ 3 ],
 			"html": "(<title>phpPgAdmin</title>|<span class=\\\"appname\\\">phpPgAdmin)"
 		},
+		"phpSQLiteCMS": {
+			"cats": [ "1" ],
+			"meta": { "generator": "^phpSQLiteCMS" },
+			"implies": [ "PHP" ]
+		},
 		"Piwik": {
 			"cats": [ 10 ],
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
@@ -1286,6 +1342,10 @@
 			"script": "(scriptaculous|protoaculous)\\.js",
 			"env": "^Scriptaculous$"
 		},
+		"SDL Tridion": {
+			"cats": [ 1 ],
+			"html": "mfinfo\\.application='Tridion"
+		},
 		"Sencha Touch": {
 			"cats": [ 26, 12 ],
 			"script": "sencha-touch.*\\.js"
@@ -1308,7 +1368,6 @@
 			"cats": [ 6 ],
 			"meta": { "application-name": "Shopware" },
 			"script": "shopware\\.js",
-			"env": "^Shopify$",
 			"implies": [ "PHP" ]
 		},
 		"sIFR": {
@@ -1348,7 +1407,8 @@
 		},
 		"Snoobi": {
 			"cats": [ 10 ],
-			"script": "snoobi\\.com/snoop\\.php"
+			"script": "snoobi\\.com/snoop\\.php",
+			"env": "^snoobi$"
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
@@ -1360,8 +1420,12 @@
 		},
 		"SPDY": {
 			"cats": [ 19 ],
-			"headers": {
-				"X-Firefox-Spdy": ".*" }
+			"headers": { "X-Firefox-Spdy": ".*" }
+		},
+		"Sphinx": {
+			"cats": [ 4 ],
+			"env": "^DOCUMENTATION_OPTIONS$",
+			"implies": [ "Python" ]
 		},
 		"SPIP": {
 			"cats": [ 1 ],
@@ -1434,6 +1498,10 @@
 			"cats": [ 24 ],
 			"env": "^tinyMCE$"
 		},
+		"Tealeaf": {
+			"cats": [ 10 ],
+			"env": "^TeaLeaf$"
+		},
 		"TomatoCart": {
 			"cats": [ 6 ],
 			"meta": { "generator": "TomatoCart" },
@@ -1585,7 +1653,7 @@
 		},
 		"WebPublisher": {
 			"cats": [ 1 ],
-			"meta": { "generator": "WEB|Publisher" }
+			"meta": { "generator": "WEB\\|Publisher" }
 		},
 		"Websale": {
 			"cats": [ 6 ],
diff --git a/drivers/chrome/_locales/en/messages.json b/drivers/chrome/_locales/en/messages.json
index 47d150b2f..bb0ee057a 100644
--- a/drivers/chrome/_locales/en/messages.json
+++ b/drivers/chrome/_locales/en/messages.json
@@ -42,5 +42,6 @@
 	"categoryName28":           { "message": "Operating System" },
 	"categoryName29":           { "message": "Search Engine" },
 	"categoryName30":           { "message": "Web Mail" },
-	"categoryName31":           { "message": "CDN" }
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Marketing Automation" }
 }
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index 9c56b4c9a..0348fdb27 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -30,7 +30,8 @@
 		"28": "operating-systems",
 		"29": "search-engines",
 		"30": "web-mail",
-		"31": "cdn"
+		"31": "cdn",
+		"32": "marketing-automation"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -96,6 +97,10 @@
 			"env": "amp_js_init",
 			"implies": [ "PHP" ]
 		},
+		"AngularJS": {
+			"cats": [ 12 ],
+			"env": "^angular$"
+		},
 		"AOLserver": {
 			"cats": [ 22 ],
 			"headers": { "Server": "AOLserver" } },
@@ -225,6 +230,10 @@
 		"CFML": {
 			"cats": [ 27 ]
 		},
+		"CacheFly": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
+		},
 		"Chameleon": {
 			"cats": [ 1 ],
 			"meta": { "generator": "chameleon-cms" },
@@ -468,8 +477,9 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ 1 ],
+			"cats": [ "1" ],
 			"meta": { "generator": "DotNetNuke" },
+			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -506,6 +516,10 @@
 			"script": "e107\\.js",
 			"implies": [ "PHP"]
 		},
+		"EdgeCast": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^ECS " }
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -539,7 +553,7 @@
 		"eZ Publish": {
 			"cats": [ 1, 6 ],
 			"meta": { "generator": "eZ Publish" },
-			"headers": {  "X-Powered-By": "^eZ Publish$" },
+			"headers": {  "X-Powered-By": "^eZ Publish" },
 			"implies": [ "PHP" ]
 		},
 		"Fact Finder": {
@@ -622,6 +636,10 @@
 			"cats": [ 22 ],
 			"headers": { "Server": "Google Frontend" }
 		},
+		"Google Code Prettify": {
+			"cats": [ 19 ],
+			"env": "^prettyPrint$"
+		},
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
@@ -636,6 +654,14 @@
 			"cats": [ 1 ],
 			"url": "sites.google.com"
 		},
+		"Google Tag Manager": {
+			"cats": [ 19 ],
+			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+		},
+		"Google Web Toolkit": {
+			"cats": [ 18 ],
+			"env": "^__gwt_"
+		},
 		"GoStats": {
 			"cats": [ 10 ],
 			"env": "^_go(stats|_track)"
@@ -653,6 +679,10 @@
 			"html": "gravityInsightsParams\\.site_guid = '",
 			"env": "^GravityInsights$"
 		},
+		"GX WebManager": {
+			"cats": [ 1 ],
+			"meta": { "generator": "GX WebManager" }
+		},
 		"Handlebars": {
 			"cats": [ 12 ],
 			"env": "^Handlebars$"
@@ -672,7 +702,7 @@
 		},
 		"Hybris": {
 			"cats": [ 6 ],
-			"html": "/sys_master/|/hybr/",
+			"html": "(/sys_master/|/hybr/|/_ui/desktop/)",
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
@@ -730,7 +760,7 @@
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "iWeb" }
+			"meta": { "generator": "^iWeb" }
 		},
 		"Jalios": {
 			"cats": [ 1 ],
@@ -745,6 +775,11 @@
 			"script": "jit.*\\.js",
 			"env": "^\\$jit$"
 		},
+		"Jirafe": {
+			"cats": [ 10, 32 ],
+			"script": "/jirafe\\.js",
+			"env": "^jirafe$"
+		},
 		"Jo": {
 			"cats": [ 26, 12 ],
 			"env": "^jo(Cache|DOM|Event)$"
@@ -758,7 +793,7 @@
 			"cats": [ 1 ],
 			"url": "option=com_",
 			"meta": { "generator": "Joomla" },
-			"html": "(<!-- JoomlaWorks \\\"K2\\\"|<[^>]+(feed|components)/com_)",
+			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill\\\")",
 			"headers": { "X-Content-Encoded-By": "Joomla" },
 			"env": "^(jcomments)$"
 		},
@@ -878,6 +913,11 @@
 			"cats": [ 13 ],
 			"html": "<img[^>]+ alt=\\\"Powered by Mantis Bugtracker"
 		},
+		"Marketo": {
+			"cats": [ 32 ],
+			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
+			"env": "^Munchkin$"
+		},
 		"MaxSite CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "MaxSite CMS" }
@@ -999,6 +1039,11 @@
 			"script": "netmonitor\\.fi/nmtracker\\.js",
 			"env": "^netmonitor"
 		},
+		"New Relic": {
+			"cats": [ 10 ],
+			"html": "<script[^>]+>var NREUMQ=NREUMQ",
+			"env": "^NREUMQ$"
+		},
 		"Nginx": {
 			"cats": [ 22 ],
 			"headers": { "Server": "nginx" }
@@ -1014,13 +1059,19 @@
 			"cats": [ 6 ],
 			"html": "(<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
 		},
+		"Open Web Analytics": {
+			"cats": [ 10 ],
+			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
+			"env": "^_?owa_"
+		},
 		"OneStat": {
 			"cats": [ 10 ],
 			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route)"
+			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"implies": [ "PHP" ]
 		},
 		"openEngine": {
 			"cats": [ 1 ],
@@ -1040,10 +1091,10 @@
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
-		"Open Web Analytics": {
-			"cats": [ 10 ],
-			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
-			"env": "^_?owa_"
+		"OpenText Web Solutions": {
+			"cats": [ 1 ],
+			"html": "<!--[^>]+published by Open Text Web Solutions",
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"Optimizely": {
 			"cats": [ 10 ],
@@ -1132,6 +1183,11 @@
 			"cats": [ 3 ],
 			"html": "(<title>phpPgAdmin</title>|<span class=\\\"appname\\\">phpPgAdmin)"
 		},
+		"phpSQLiteCMS": {
+			"cats": [ "1" ],
+			"meta": { "generator": "^phpSQLiteCMS" },
+			"implies": [ "PHP" ]
+		},
 		"Piwik": {
 			"cats": [ 10 ],
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
@@ -1286,6 +1342,10 @@
 			"script": "(scriptaculous|protoaculous)\\.js",
 			"env": "^Scriptaculous$"
 		},
+		"SDL Tridion": {
+			"cats": [ 1 ],
+			"html": "mfinfo\\.application='Tridion"
+		},
 		"Sencha Touch": {
 			"cats": [ 26, 12 ],
 			"script": "sencha-touch.*\\.js"
@@ -1308,7 +1368,6 @@
 			"cats": [ 6 ],
 			"meta": { "application-name": "Shopware" },
 			"script": "shopware\\.js",
-			"env": "^Shopify$",
 			"implies": [ "PHP" ]
 		},
 		"sIFR": {
@@ -1348,7 +1407,8 @@
 		},
 		"Snoobi": {
 			"cats": [ 10 ],
-			"script": "snoobi\\.com/snoop\\.php"
+			"script": "snoobi\\.com/snoop\\.php",
+			"env": "^snoobi$"
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
@@ -1360,8 +1420,12 @@
 		},
 		"SPDY": {
 			"cats": [ 19 ],
-			"headers": {
-				"X-Firefox-Spdy": ".*" }
+			"headers": { "X-Firefox-Spdy": ".*" }
+		},
+		"Sphinx": {
+			"cats": [ 4 ],
+			"env": "^DOCUMENTATION_OPTIONS$",
+			"implies": [ "Python" ]
 		},
 		"SPIP": {
 			"cats": [ 1 ],
@@ -1434,6 +1498,10 @@
 			"cats": [ 24 ],
 			"env": "^tinyMCE$"
 		},
+		"Tealeaf": {
+			"cats": [ 10 ],
+			"env": "^TeaLeaf$"
+		},
 		"TomatoCart": {
 			"cats": [ 6 ],
 			"meta": { "generator": "TomatoCart" },
@@ -1585,7 +1653,7 @@
 		},
 		"WebPublisher": {
 			"cats": [ 1 ],
-			"meta": { "generator": "WEB|Publisher" }
+			"meta": { "generator": "WEB\\|Publisher" }
 		},
 		"Websale": {
 			"cats": [ 6 ],
diff --git a/drivers/chrome/images/icons/Snoobi.png b/drivers/chrome/images/icons/Snoobi.png
index c1c900721..0f046cb82 100644
Binary files a/drivers/chrome/images/icons/Snoobi.png and b/drivers/chrome/images/icons/Snoobi.png differ
diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index 90fb825ca..d7611ee02 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -206,6 +206,7 @@
 			15, // Comment System
 			20, // Editor
 			10, // Analytics
+			32, // Marketing Automation
 			31, // CDN
 			23, // Cache Tool
 			17, // Font Script
diff --git a/drivers/chrome/js/wappalyzer.js b/drivers/chrome/js/wappalyzer.js
index 92a829f4a..5d1631368 100644
--- a/drivers/chrome/js/wappalyzer.js
+++ b/drivers/chrome/js/wappalyzer.js
@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;
diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index 939f68dde..6f81b46e7 100644
--- a/drivers/chrome/manifest.json
+++ b/drivers/chrome/manifest.json
@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=extension&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.14",
+	"version": "2.15",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index 9c56b4c9a..0348fdb27 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -30,7 +30,8 @@
 		"28": "operating-systems",
 		"29": "search-engines",
 		"30": "web-mail",
-		"31": "cdn"
+		"31": "cdn",
+		"32": "marketing-automation"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -96,6 +97,10 @@
 			"env": "amp_js_init",
 			"implies": [ "PHP" ]
 		},
+		"AngularJS": {
+			"cats": [ 12 ],
+			"env": "^angular$"
+		},
 		"AOLserver": {
 			"cats": [ 22 ],
 			"headers": { "Server": "AOLserver" } },
@@ -225,6 +230,10 @@
 		"CFML": {
 			"cats": [ 27 ]
 		},
+		"CacheFly": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
+		},
 		"Chameleon": {
 			"cats": [ 1 ],
 			"meta": { "generator": "chameleon-cms" },
@@ -468,8 +477,9 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ 1 ],
+			"cats": [ "1" ],
 			"meta": { "generator": "DotNetNuke" },
+			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -506,6 +516,10 @@
 			"script": "e107\\.js",
 			"implies": [ "PHP"]
 		},
+		"EdgeCast": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^ECS " }
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -539,7 +553,7 @@
 		"eZ Publish": {
 			"cats": [ 1, 6 ],
 			"meta": { "generator": "eZ Publish" },
-			"headers": {  "X-Powered-By": "^eZ Publish$" },
+			"headers": {  "X-Powered-By": "^eZ Publish" },
 			"implies": [ "PHP" ]
 		},
 		"Fact Finder": {
@@ -622,6 +636,10 @@
 			"cats": [ 22 ],
 			"headers": { "Server": "Google Frontend" }
 		},
+		"Google Code Prettify": {
+			"cats": [ 19 ],
+			"env": "^prettyPrint$"
+		},
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
@@ -636,6 +654,14 @@
 			"cats": [ 1 ],
 			"url": "sites.google.com"
 		},
+		"Google Tag Manager": {
+			"cats": [ 19 ],
+			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+		},
+		"Google Web Toolkit": {
+			"cats": [ 18 ],
+			"env": "^__gwt_"
+		},
 		"GoStats": {
 			"cats": [ 10 ],
 			"env": "^_go(stats|_track)"
@@ -653,6 +679,10 @@
 			"html": "gravityInsightsParams\\.site_guid = '",
 			"env": "^GravityInsights$"
 		},
+		"GX WebManager": {
+			"cats": [ 1 ],
+			"meta": { "generator": "GX WebManager" }
+		},
 		"Handlebars": {
 			"cats": [ 12 ],
 			"env": "^Handlebars$"
@@ -672,7 +702,7 @@
 		},
 		"Hybris": {
 			"cats": [ 6 ],
-			"html": "/sys_master/|/hybr/",
+			"html": "(/sys_master/|/hybr/|/_ui/desktop/)",
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
@@ -730,7 +760,7 @@
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "iWeb" }
+			"meta": { "generator": "^iWeb" }
 		},
 		"Jalios": {
 			"cats": [ 1 ],
@@ -745,6 +775,11 @@
 			"script": "jit.*\\.js",
 			"env": "^\\$jit$"
 		},
+		"Jirafe": {
+			"cats": [ 10, 32 ],
+			"script": "/jirafe\\.js",
+			"env": "^jirafe$"
+		},
 		"Jo": {
 			"cats": [ 26, 12 ],
 			"env": "^jo(Cache|DOM|Event)$"
@@ -758,7 +793,7 @@
 			"cats": [ 1 ],
 			"url": "option=com_",
 			"meta": { "generator": "Joomla" },
-			"html": "(<!-- JoomlaWorks \\\"K2\\\"|<[^>]+(feed|components)/com_)",
+			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill\\\")",
 			"headers": { "X-Content-Encoded-By": "Joomla" },
 			"env": "^(jcomments)$"
 		},
@@ -878,6 +913,11 @@
 			"cats": [ 13 ],
 			"html": "<img[^>]+ alt=\\\"Powered by Mantis Bugtracker"
 		},
+		"Marketo": {
+			"cats": [ 32 ],
+			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
+			"env": "^Munchkin$"
+		},
 		"MaxSite CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "MaxSite CMS" }
@@ -999,6 +1039,11 @@
 			"script": "netmonitor\\.fi/nmtracker\\.js",
 			"env": "^netmonitor"
 		},
+		"New Relic": {
+			"cats": [ 10 ],
+			"html": "<script[^>]+>var NREUMQ=NREUMQ",
+			"env": "^NREUMQ$"
+		},
 		"Nginx": {
 			"cats": [ 22 ],
 			"headers": { "Server": "nginx" }
@@ -1014,13 +1059,19 @@
 			"cats": [ 6 ],
 			"html": "(<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
 		},
+		"Open Web Analytics": {
+			"cats": [ 10 ],
+			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
+			"env": "^_?owa_"
+		},
 		"OneStat": {
 			"cats": [ 10 ],
 			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route)"
+			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"implies": [ "PHP" ]
 		},
 		"openEngine": {
 			"cats": [ 1 ],
@@ -1040,10 +1091,10 @@
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
-		"Open Web Analytics": {
-			"cats": [ 10 ],
-			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
-			"env": "^_?owa_"
+		"OpenText Web Solutions": {
+			"cats": [ 1 ],
+			"html": "<!--[^>]+published by Open Text Web Solutions",
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"Optimizely": {
 			"cats": [ 10 ],
@@ -1132,6 +1183,11 @@
 			"cats": [ 3 ],
 			"html": "(<title>phpPgAdmin</title>|<span class=\\\"appname\\\">phpPgAdmin)"
 		},
+		"phpSQLiteCMS": {
+			"cats": [ "1" ],
+			"meta": { "generator": "^phpSQLiteCMS" },
+			"implies": [ "PHP" ]
+		},
 		"Piwik": {
 			"cats": [ 10 ],
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
@@ -1286,6 +1342,10 @@
 			"script": "(scriptaculous|protoaculous)\\.js",
 			"env": "^Scriptaculous$"
 		},
+		"SDL Tridion": {
+			"cats": [ 1 ],
+			"html": "mfinfo\\.application='Tridion"
+		},
 		"Sencha Touch": {
 			"cats": [ 26, 12 ],
 			"script": "sencha-touch.*\\.js"
@@ -1308,7 +1368,6 @@
 			"cats": [ 6 ],
 			"meta": { "application-name": "Shopware" },
 			"script": "shopware\\.js",
-			"env": "^Shopify$",
 			"implies": [ "PHP" ]
 		},
 		"sIFR": {
@@ -1348,7 +1407,8 @@
 		},
 		"Snoobi": {
 			"cats": [ 10 ],
-			"script": "snoobi\\.com/snoop\\.php"
+			"script": "snoobi\\.com/snoop\\.php",
+			"env": "^snoobi$"
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
@@ -1360,8 +1420,12 @@
 		},
 		"SPDY": {
 			"cats": [ 19 ],
-			"headers": {
-				"X-Firefox-Spdy": ".*" }
+			"headers": { "X-Firefox-Spdy": ".*" }
+		},
+		"Sphinx": {
+			"cats": [ 4 ],
+			"env": "^DOCUMENTATION_OPTIONS$",
+			"implies": [ "Python" ]
 		},
 		"SPIP": {
 			"cats": [ 1 ],
@@ -1434,6 +1498,10 @@
 			"cats": [ 24 ],
 			"env": "^tinyMCE$"
 		},
+		"Tealeaf": {
+			"cats": [ 10 ],
+			"env": "^TeaLeaf$"
+		},
 		"TomatoCart": {
 			"cats": [ 6 ],
 			"meta": { "generator": "TomatoCart" },
@@ -1585,7 +1653,7 @@
 		},
 		"WebPublisher": {
 			"cats": [ 1 ],
-			"meta": { "generator": "WEB|Publisher" }
+			"meta": { "generator": "WEB\\|Publisher" }
 		},
 		"Websale": {
 			"cats": [ 6 ],
diff --git a/drivers/firefox-jetpack/images/icons/Snoobi.png b/drivers/firefox-jetpack/images/icons/Snoobi.png
index c1c900721..0f046cb82 100644
Binary files a/drivers/firefox-jetpack/images/icons/Snoobi.png and b/drivers/firefox-jetpack/images/icons/Snoobi.png differ
diff --git a/drivers/firefox-jetpack/lib/wappalyzer.js b/drivers/firefox-jetpack/lib/wappalyzer.js
index 92a829f4a..5d1631368 100644
--- a/drivers/firefox-jetpack/lib/wappalyzer.js
+++ b/drivers/firefox-jetpack/lib/wappalyzer.js
@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index 9c56b4c9a..0348fdb27 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -30,7 +30,8 @@
 		"28": "operating-systems",
 		"29": "search-engines",
 		"30": "web-mail",
-		"31": "cdn"
+		"31": "cdn",
+		"32": "marketing-automation"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -96,6 +97,10 @@
 			"env": "amp_js_init",
 			"implies": [ "PHP" ]
 		},
+		"AngularJS": {
+			"cats": [ 12 ],
+			"env": "^angular$"
+		},
 		"AOLserver": {
 			"cats": [ 22 ],
 			"headers": { "Server": "AOLserver" } },
@@ -225,6 +230,10 @@
 		"CFML": {
 			"cats": [ 27 ]
 		},
+		"CacheFly": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
+		},
 		"Chameleon": {
 			"cats": [ 1 ],
 			"meta": { "generator": "chameleon-cms" },
@@ -468,8 +477,9 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ 1 ],
+			"cats": [ "1" ],
 			"meta": { "generator": "DotNetNuke" },
+			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -506,6 +516,10 @@
 			"script": "e107\\.js",
 			"implies": [ "PHP"]
 		},
+		"EdgeCast": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^ECS " }
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -539,7 +553,7 @@
 		"eZ Publish": {
 			"cats": [ 1, 6 ],
 			"meta": { "generator": "eZ Publish" },
-			"headers": {  "X-Powered-By": "^eZ Publish$" },
+			"headers": {  "X-Powered-By": "^eZ Publish" },
 			"implies": [ "PHP" ]
 		},
 		"Fact Finder": {
@@ -622,6 +636,10 @@
 			"cats": [ 22 ],
 			"headers": { "Server": "Google Frontend" }
 		},
+		"Google Code Prettify": {
+			"cats": [ 19 ],
+			"env": "^prettyPrint$"
+		},
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
@@ -636,6 +654,14 @@
 			"cats": [ 1 ],
 			"url": "sites.google.com"
 		},
+		"Google Tag Manager": {
+			"cats": [ 19 ],
+			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+		},
+		"Google Web Toolkit": {
+			"cats": [ 18 ],
+			"env": "^__gwt_"
+		},
 		"GoStats": {
 			"cats": [ 10 ],
 			"env": "^_go(stats|_track)"
@@ -653,6 +679,10 @@
 			"html": "gravityInsightsParams\\.site_guid = '",
 			"env": "^GravityInsights$"
 		},
+		"GX WebManager": {
+			"cats": [ 1 ],
+			"meta": { "generator": "GX WebManager" }
+		},
 		"Handlebars": {
 			"cats": [ 12 ],
 			"env": "^Handlebars$"
@@ -672,7 +702,7 @@
 		},
 		"Hybris": {
 			"cats": [ 6 ],
-			"html": "/sys_master/|/hybr/",
+			"html": "(/sys_master/|/hybr/|/_ui/desktop/)",
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
@@ -730,7 +760,7 @@
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "iWeb" }
+			"meta": { "generator": "^iWeb" }
 		},
 		"Jalios": {
 			"cats": [ 1 ],
@@ -745,6 +775,11 @@
 			"script": "jit.*\\.js",
 			"env": "^\\$jit$"
 		},
+		"Jirafe": {
+			"cats": [ 10, 32 ],
+			"script": "/jirafe\\.js",
+			"env": "^jirafe$"
+		},
 		"Jo": {
 			"cats": [ 26, 12 ],
 			"env": "^jo(Cache|DOM|Event)$"
@@ -758,7 +793,7 @@
 			"cats": [ 1 ],
 			"url": "option=com_",
 			"meta": { "generator": "Joomla" },
-			"html": "(<!-- JoomlaWorks \\\"K2\\\"|<[^>]+(feed|components)/com_)",
+			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill\\\")",
 			"headers": { "X-Content-Encoded-By": "Joomla" },
 			"env": "^(jcomments)$"
 		},
@@ -878,6 +913,11 @@
 			"cats": [ 13 ],
 			"html": "<img[^>]+ alt=\\\"Powered by Mantis Bugtracker"
 		},
+		"Marketo": {
+			"cats": [ 32 ],
+			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
+			"env": "^Munchkin$"
+		},
 		"MaxSite CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "MaxSite CMS" }
@@ -999,6 +1039,11 @@
 			"script": "netmonitor\\.fi/nmtracker\\.js",
 			"env": "^netmonitor"
 		},
+		"New Relic": {
+			"cats": [ 10 ],
+			"html": "<script[^>]+>var NREUMQ=NREUMQ",
+			"env": "^NREUMQ$"
+		},
 		"Nginx": {
 			"cats": [ 22 ],
 			"headers": { "Server": "nginx" }
@@ -1014,13 +1059,19 @@
 			"cats": [ 6 ],
 			"html": "(<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
 		},
+		"Open Web Analytics": {
+			"cats": [ 10 ],
+			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
+			"env": "^_?owa_"
+		},
 		"OneStat": {
 			"cats": [ 10 ],
 			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route)"
+			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"implies": [ "PHP" ]
 		},
 		"openEngine": {
 			"cats": [ 1 ],
@@ -1040,10 +1091,10 @@
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
-		"Open Web Analytics": {
-			"cats": [ 10 ],
-			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
-			"env": "^_?owa_"
+		"OpenText Web Solutions": {
+			"cats": [ 1 ],
+			"html": "<!--[^>]+published by Open Text Web Solutions",
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"Optimizely": {
 			"cats": [ 10 ],
@@ -1132,6 +1183,11 @@
 			"cats": [ 3 ],
 			"html": "(<title>phpPgAdmin</title>|<span class=\\\"appname\\\">phpPgAdmin)"
 		},
+		"phpSQLiteCMS": {
+			"cats": [ "1" ],
+			"meta": { "generator": "^phpSQLiteCMS" },
+			"implies": [ "PHP" ]
+		},
 		"Piwik": {
 			"cats": [ 10 ],
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
@@ -1286,6 +1342,10 @@
 			"script": "(scriptaculous|protoaculous)\\.js",
 			"env": "^Scriptaculous$"
 		},
+		"SDL Tridion": {
+			"cats": [ 1 ],
+			"html": "mfinfo\\.application='Tridion"
+		},
 		"Sencha Touch": {
 			"cats": [ 26, 12 ],
 			"script": "sencha-touch.*\\.js"
@@ -1308,7 +1368,6 @@
 			"cats": [ 6 ],
 			"meta": { "application-name": "Shopware" },
 			"script": "shopware\\.js",
-			"env": "^Shopify$",
 			"implies": [ "PHP" ]
 		},
 		"sIFR": {
@@ -1348,7 +1407,8 @@
 		},
 		"Snoobi": {
 			"cats": [ 10 ],
-			"script": "snoobi\\.com/snoop\\.php"
+			"script": "snoobi\\.com/snoop\\.php",
+			"env": "^snoobi$"
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
@@ -1360,8 +1420,12 @@
 		},
 		"SPDY": {
 			"cats": [ 19 ],
-			"headers": {
-				"X-Firefox-Spdy": ".*" }
+			"headers": { "X-Firefox-Spdy": ".*" }
+		},
+		"Sphinx": {
+			"cats": [ 4 ],
+			"env": "^DOCUMENTATION_OPTIONS$",
+			"implies": [ "Python" ]
 		},
 		"SPIP": {
 			"cats": [ 1 ],
@@ -1434,6 +1498,10 @@
 			"cats": [ 24 ],
 			"env": "^tinyMCE$"
 		},
+		"Tealeaf": {
+			"cats": [ 10 ],
+			"env": "^TeaLeaf$"
+		},
 		"TomatoCart": {
 			"cats": [ 6 ],
 			"meta": { "generator": "TomatoCart" },
@@ -1585,7 +1653,7 @@
 		},
 		"WebPublisher": {
 			"cats": [ 1 ],
-			"meta": { "generator": "WEB|Publisher" }
+			"meta": { "generator": "WEB\\|Publisher" }
 		},
 		"Websale": {
 			"cats": [ 6 ],
diff --git a/drivers/firefox/content/js/wappalyzer.js b/drivers/firefox/content/js/wappalyzer.js
index 92a829f4a..5d1631368 100644
--- a/drivers/firefox/content/js/wappalyzer.js
+++ b/drivers/firefox/content/js/wappalyzer.js
@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;
diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index 1259ddcaf..5d3791820 100755
--- a/drivers/firefox/content/xul/preferences.xul
+++ b/drivers/firefox/content/xul/preferences.xul
@@ -46,6 +46,7 @@
 			<preference id="wappalyzer-cat29" name="extensions.wappalyzer.cat29" type="bool"/>
 			<preference id="wappalyzer-cat30" name="extensions.wappalyzer.cat30" type="bool"/>
 			<preference id="wappalyzer-cat31" name="extensions.wappalyzer.cat31" type="bool"/>
+			<preference id="wappalyzer-cat31" name="extensions.wappalyzer.cat32" type="bool"/>
 
 			<preference id="wappalyzer-tracking" name="extensions.wappalyzer.tracking" type="bool"/>
 		</preferences>
@@ -132,10 +133,11 @@
 							<checkbox preference="wappalyzer-cat27" label="&wappalyzer.cat27;"/>
 							<checkbox preference="wappalyzer-cat28" label="&wappalyzer.cat28;"/>
 							<checkbox preference="wappalyzer-cat29" label="&wappalyzer.cat29;"/>
-							<checkbox preference="wappalyzer-cat29" label="&wappalyzer.cat30;"/>
+							<checkbox preference="wappalyzer-cat30" label="&wappalyzer.cat30;"/>
 						</row>
 						<row>
-							<checkbox preference="wappalyzer-cat29" label="&wappalyzer.cat31;"/>
+							<checkbox preference="wappalyzer-cat31" label="&wappalyzer.cat31;"/>
+							<checkbox preference="wappalyzer-cat32" label="&wappalyzer.cat31;"/>
 						</row>
 					</rows>
 				</grid>
diff --git a/drivers/firefox/defaults/preferences/defaults.js b/drivers/firefox/defaults/preferences/defaults.js
index d7bac6b36..497949c78 100644
--- a/drivers/firefox/defaults/preferences/defaults.js
+++ b/drivers/firefox/defaults/preferences/defaults.js
@@ -38,3 +38,4 @@ pref('extensions.wappalyzer.cat28',             true);
 pref('extensions.wappalyzer.cat29',             true);
 pref('extensions.wappalyzer.cat30',             true);
 pref('extensions.wappalyzer.cat31',             true);
+pref('extensions.wappalyzer.cat32',             true);
diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index bf35be339..98a4fdb3e 100644
--- a/drivers/firefox/install.rdf
+++ b/drivers/firefox/install.rdf
@@ -3,7 +3,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>wappalyzer@crunchlabz.com</em:id>
-		<em:version>2.5.1</em:version>
+		<em:version>2.5.2</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
diff --git a/drivers/firefox/locale/de-DE/wappalyzer.dtd b/drivers/firefox/locale/de-DE/wappalyzer.dtd
index ecddadb74..ac3088290 100755
--- a/drivers/firefox/locale/de-DE/wappalyzer.dtd
+++ b/drivers/firefox/locale/de-DE/wappalyzer.dtd
@@ -49,3 +49,4 @@
 <!ENTITY wappalyzer.cat29             "Suchmaschinen">
 <!ENTITY wappalyzer.cat30             "Web mail">
 <!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Marketing Automation">
diff --git a/drivers/firefox/locale/de-DE/wappalyzer.properties b/drivers/firefox/locale/de-DE/wappalyzer.properties
index e9ea9df9a..c67be7451 100755
--- a/drivers/firefox/locale/de-DE/wappalyzer.properties
+++ b/drivers/firefox/locale/de-DE/wappalyzer.properties
@@ -33,3 +33,4 @@ wappalyzer.cat28          = Operating System
 wappalyzer.cat29          = Search Engine
 wappalyzer.cat30          = Web mail
 wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Marketing Automation
diff --git a/drivers/firefox/locale/en-US/wappalyzer.dtd b/drivers/firefox/locale/en-US/wappalyzer.dtd
index 904f910ee..3ab8b0f99 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.dtd
+++ b/drivers/firefox/locale/en-US/wappalyzer.dtd
@@ -50,3 +50,4 @@
 <!ENTITY wappalyzer.cat29             "Search Engines">
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Marketing Automation">
diff --git a/drivers/firefox/locale/en-US/wappalyzer.properties b/drivers/firefox/locale/en-US/wappalyzer.properties
index a537bdcf9..7234a8152 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.properties
+++ b/drivers/firefox/locale/en-US/wappalyzer.properties
@@ -33,3 +33,4 @@ wappalyzer.cat28          = Operating System
 wappalyzer.cat29          = Search Engine
 wappalyzer.cat30          = Web Mail
 wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Marketing Automation
diff --git a/drivers/firefox/locale/fr-FR/wappalyzer.dtd b/drivers/firefox/locale/fr-FR/wappalyzer.dtd
index 5f2dd2bcf..ddfa12bef 100644
--- a/drivers/firefox/locale/fr-FR/wappalyzer.dtd
+++ b/drivers/firefox/locale/fr-FR/wappalyzer.dtd
@@ -49,3 +49,4 @@
 <!ENTITY wappalyzer.cat29             "Moteurs de recherche">
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Marketing Automation">
diff --git a/drivers/firefox/locale/fr-FR/wappalyzer.properties b/drivers/firefox/locale/fr-FR/wappalyzer.properties
index d4ab5ea70..61580223b 100644
--- a/drivers/firefox/locale/fr-FR/wappalyzer.properties
+++ b/drivers/firefox/locale/fr-FR/wappalyzer.properties
@@ -33,3 +33,4 @@ wappalyzer.cat28          = Système d'exploitation
 wappalyzer.cat29          = Moteur de recherche
 wappalyzer.cat30          = Web Mail
 wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Marketing Automation
diff --git a/drivers/firefox/locale/nl-NL/wappalyzer.dtd b/drivers/firefox/locale/nl-NL/wappalyzer.dtd
index 852d4af44..30d85e3ab 100755
--- a/drivers/firefox/locale/nl-NL/wappalyzer.dtd
+++ b/drivers/firefox/locale/nl-NL/wappalyzer.dtd
@@ -48,3 +48,4 @@
 <!ENTITY wappalyzer.cat28             "Operating Systems">
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Marketing Automatisering">
diff --git a/drivers/firefox/locale/nl-NL/wappalyzer.properties b/drivers/firefox/locale/nl-NL/wappalyzer.properties
index 17c70d143..74c4c597f 100755
--- a/drivers/firefox/locale/nl-NL/wappalyzer.properties
+++ b/drivers/firefox/locale/nl-NL/wappalyzer.properties
@@ -33,3 +33,4 @@ wappalyzer.cat28          = Operating System
 wappalyzer.cat29          = Zoek Machine
 wappalyzer.cat30          = Web Mail
 wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Marketing Automatisering
diff --git a/drivers/firefox/skin/images/icons/Snoobi.png b/drivers/firefox/skin/images/icons/Snoobi.png
index c1c900721..0f046cb82 100644
Binary files a/drivers/firefox/skin/images/icons/Snoobi.png and b/drivers/firefox/skin/images/icons/Snoobi.png differ
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index 9c56b4c9a..0348fdb27 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -30,7 +30,8 @@
 		"28": "operating-systems",
 		"29": "search-engines",
 		"30": "web-mail",
-		"31": "cdn"
+		"31": "cdn",
+		"32": "marketing-automation"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -96,6 +97,10 @@
 			"env": "amp_js_init",
 			"implies": [ "PHP" ]
 		},
+		"AngularJS": {
+			"cats": [ 12 ],
+			"env": "^angular$"
+		},
 		"AOLserver": {
 			"cats": [ 22 ],
 			"headers": { "Server": "AOLserver" } },
@@ -225,6 +230,10 @@
 		"CFML": {
 			"cats": [ 27 ]
 		},
+		"CacheFly": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
+		},
 		"Chameleon": {
 			"cats": [ 1 ],
 			"meta": { "generator": "chameleon-cms" },
@@ -468,8 +477,9 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ 1 ],
+			"cats": [ "1" ],
 			"meta": { "generator": "DotNetNuke" },
+			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -506,6 +516,10 @@
 			"script": "e107\\.js",
 			"implies": [ "PHP"]
 		},
+		"EdgeCast": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^ECS " }
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -539,7 +553,7 @@
 		"eZ Publish": {
 			"cats": [ 1, 6 ],
 			"meta": { "generator": "eZ Publish" },
-			"headers": {  "X-Powered-By": "^eZ Publish$" },
+			"headers": {  "X-Powered-By": "^eZ Publish" },
 			"implies": [ "PHP" ]
 		},
 		"Fact Finder": {
@@ -622,6 +636,10 @@
 			"cats": [ 22 ],
 			"headers": { "Server": "Google Frontend" }
 		},
+		"Google Code Prettify": {
+			"cats": [ 19 ],
+			"env": "^prettyPrint$"
+		},
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
@@ -636,6 +654,14 @@
 			"cats": [ 1 ],
 			"url": "sites.google.com"
 		},
+		"Google Tag Manager": {
+			"cats": [ 19 ],
+			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+		},
+		"Google Web Toolkit": {
+			"cats": [ 18 ],
+			"env": "^__gwt_"
+		},
 		"GoStats": {
 			"cats": [ 10 ],
 			"env": "^_go(stats|_track)"
@@ -653,6 +679,10 @@
 			"html": "gravityInsightsParams\\.site_guid = '",
 			"env": "^GravityInsights$"
 		},
+		"GX WebManager": {
+			"cats": [ 1 ],
+			"meta": { "generator": "GX WebManager" }
+		},
 		"Handlebars": {
 			"cats": [ 12 ],
 			"env": "^Handlebars$"
@@ -672,7 +702,7 @@
 		},
 		"Hybris": {
 			"cats": [ 6 ],
-			"html": "/sys_master/|/hybr/",
+			"html": "(/sys_master/|/hybr/|/_ui/desktop/)",
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
@@ -730,7 +760,7 @@
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "iWeb" }
+			"meta": { "generator": "^iWeb" }
 		},
 		"Jalios": {
 			"cats": [ 1 ],
@@ -745,6 +775,11 @@
 			"script": "jit.*\\.js",
 			"env": "^\\$jit$"
 		},
+		"Jirafe": {
+			"cats": [ 10, 32 ],
+			"script": "/jirafe\\.js",
+			"env": "^jirafe$"
+		},
 		"Jo": {
 			"cats": [ 26, 12 ],
 			"env": "^jo(Cache|DOM|Event)$"
@@ -758,7 +793,7 @@
 			"cats": [ 1 ],
 			"url": "option=com_",
 			"meta": { "generator": "Joomla" },
-			"html": "(<!-- JoomlaWorks \\\"K2\\\"|<[^>]+(feed|components)/com_)",
+			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill\\\")",
 			"headers": { "X-Content-Encoded-By": "Joomla" },
 			"env": "^(jcomments)$"
 		},
@@ -878,6 +913,11 @@
 			"cats": [ 13 ],
 			"html": "<img[^>]+ alt=\\\"Powered by Mantis Bugtracker"
 		},
+		"Marketo": {
+			"cats": [ 32 ],
+			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
+			"env": "^Munchkin$"
+		},
 		"MaxSite CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "MaxSite CMS" }
@@ -999,6 +1039,11 @@
 			"script": "netmonitor\\.fi/nmtracker\\.js",
 			"env": "^netmonitor"
 		},
+		"New Relic": {
+			"cats": [ 10 ],
+			"html": "<script[^>]+>var NREUMQ=NREUMQ",
+			"env": "^NREUMQ$"
+		},
 		"Nginx": {
 			"cats": [ 22 ],
 			"headers": { "Server": "nginx" }
@@ -1014,13 +1059,19 @@
 			"cats": [ 6 ],
 			"html": "(<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
 		},
+		"Open Web Analytics": {
+			"cats": [ 10 ],
+			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
+			"env": "^_?owa_"
+		},
 		"OneStat": {
 			"cats": [ 10 ],
 			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route)"
+			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"implies": [ "PHP" ]
 		},
 		"openEngine": {
 			"cats": [ 1 ],
@@ -1040,10 +1091,10 @@
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
-		"Open Web Analytics": {
-			"cats": [ 10 ],
-			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
-			"env": "^_?owa_"
+		"OpenText Web Solutions": {
+			"cats": [ 1 ],
+			"html": "<!--[^>]+published by Open Text Web Solutions",
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"Optimizely": {
 			"cats": [ 10 ],
@@ -1132,6 +1183,11 @@
 			"cats": [ 3 ],
 			"html": "(<title>phpPgAdmin</title>|<span class=\\\"appname\\\">phpPgAdmin)"
 		},
+		"phpSQLiteCMS": {
+			"cats": [ "1" ],
+			"meta": { "generator": "^phpSQLiteCMS" },
+			"implies": [ "PHP" ]
+		},
 		"Piwik": {
 			"cats": [ 10 ],
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
@@ -1286,6 +1342,10 @@
 			"script": "(scriptaculous|protoaculous)\\.js",
 			"env": "^Scriptaculous$"
 		},
+		"SDL Tridion": {
+			"cats": [ 1 ],
+			"html": "mfinfo\\.application='Tridion"
+		},
 		"Sencha Touch": {
 			"cats": [ 26, 12 ],
 			"script": "sencha-touch.*\\.js"
@@ -1308,7 +1368,6 @@
 			"cats": [ 6 ],
 			"meta": { "application-name": "Shopware" },
 			"script": "shopware\\.js",
-			"env": "^Shopify$",
 			"implies": [ "PHP" ]
 		},
 		"sIFR": {
@@ -1348,7 +1407,8 @@
 		},
 		"Snoobi": {
 			"cats": [ 10 ],
-			"script": "snoobi\\.com/snoop\\.php"
+			"script": "snoobi\\.com/snoop\\.php",
+			"env": "^snoobi$"
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
@@ -1360,8 +1420,12 @@
 		},
 		"SPDY": {
 			"cats": [ 19 ],
-			"headers": {
-				"X-Firefox-Spdy": ".*" }
+			"headers": { "X-Firefox-Spdy": ".*" }
+		},
+		"Sphinx": {
+			"cats": [ 4 ],
+			"env": "^DOCUMENTATION_OPTIONS$",
+			"implies": [ "Python" ]
 		},
 		"SPIP": {
 			"cats": [ 1 ],
@@ -1434,6 +1498,10 @@
 			"cats": [ 24 ],
 			"env": "^tinyMCE$"
 		},
+		"Tealeaf": {
+			"cats": [ 10 ],
+			"env": "^TeaLeaf$"
+		},
 		"TomatoCart": {
 			"cats": [ 6 ],
 			"meta": { "generator": "TomatoCart" },
@@ -1585,7 +1653,7 @@
 		},
 		"WebPublisher": {
 			"cats": [ 1 ],
-			"meta": { "generator": "WEB|Publisher" }
+			"meta": { "generator": "WEB\\|Publisher" }
 		},
 		"Websale": {
 			"cats": [ 6 ],
diff --git a/drivers/html/images/icons/Snoobi.png b/drivers/html/images/icons/Snoobi.png
index c1c900721..0f046cb82 100644
Binary files a/drivers/html/images/icons/Snoobi.png and b/drivers/html/images/icons/Snoobi.png differ
diff --git a/drivers/html/js/wappalyzer.js b/drivers/html/js/wappalyzer.js
index 92a829f4a..5d1631368 100644
--- a/drivers/html/js/wappalyzer.js
+++ b/drivers/html/js/wappalyzer.js
@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index 9c56b4c9a..0348fdb27 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -30,7 +30,8 @@
 		"28": "operating-systems",
 		"29": "search-engines",
 		"30": "web-mail",
-		"31": "cdn"
+		"31": "cdn",
+		"32": "marketing-automation"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -96,6 +97,10 @@
 			"env": "amp_js_init",
 			"implies": [ "PHP" ]
 		},
+		"AngularJS": {
+			"cats": [ 12 ],
+			"env": "^angular$"
+		},
 		"AOLserver": {
 			"cats": [ 22 ],
 			"headers": { "Server": "AOLserver" } },
@@ -225,6 +230,10 @@
 		"CFML": {
 			"cats": [ 27 ]
 		},
+		"CacheFly": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
+		},
 		"Chameleon": {
 			"cats": [ 1 ],
 			"meta": { "generator": "chameleon-cms" },
@@ -468,8 +477,9 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ 1 ],
+			"cats": [ "1" ],
 			"meta": { "generator": "DotNetNuke" },
+			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -506,6 +516,10 @@
 			"script": "e107\\.js",
 			"implies": [ "PHP"]
 		},
+		"EdgeCast": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^ECS " }
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -539,7 +553,7 @@
 		"eZ Publish": {
 			"cats": [ 1, 6 ],
 			"meta": { "generator": "eZ Publish" },
-			"headers": {  "X-Powered-By": "^eZ Publish$" },
+			"headers": {  "X-Powered-By": "^eZ Publish" },
 			"implies": [ "PHP" ]
 		},
 		"Fact Finder": {
@@ -622,6 +636,10 @@
 			"cats": [ 22 ],
 			"headers": { "Server": "Google Frontend" }
 		},
+		"Google Code Prettify": {
+			"cats": [ 19 ],
+			"env": "^prettyPrint$"
+		},
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
@@ -636,6 +654,14 @@
 			"cats": [ 1 ],
 			"url": "sites.google.com"
 		},
+		"Google Tag Manager": {
+			"cats": [ 19 ],
+			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+		},
+		"Google Web Toolkit": {
+			"cats": [ 18 ],
+			"env": "^__gwt_"
+		},
 		"GoStats": {
 			"cats": [ 10 ],
 			"env": "^_go(stats|_track)"
@@ -653,6 +679,10 @@
 			"html": "gravityInsightsParams\\.site_guid = '",
 			"env": "^GravityInsights$"
 		},
+		"GX WebManager": {
+			"cats": [ 1 ],
+			"meta": { "generator": "GX WebManager" }
+		},
 		"Handlebars": {
 			"cats": [ 12 ],
 			"env": "^Handlebars$"
@@ -672,7 +702,7 @@
 		},
 		"Hybris": {
 			"cats": [ 6 ],
-			"html": "/sys_master/|/hybr/",
+			"html": "(/sys_master/|/hybr/|/_ui/desktop/)",
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
@@ -730,7 +760,7 @@
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "iWeb" }
+			"meta": { "generator": "^iWeb" }
 		},
 		"Jalios": {
 			"cats": [ 1 ],
@@ -745,6 +775,11 @@
 			"script": "jit.*\\.js",
 			"env": "^\\$jit$"
 		},
+		"Jirafe": {
+			"cats": [ 10, 32 ],
+			"script": "/jirafe\\.js",
+			"env": "^jirafe$"
+		},
 		"Jo": {
 			"cats": [ 26, 12 ],
 			"env": "^jo(Cache|DOM|Event)$"
@@ -758,7 +793,7 @@
 			"cats": [ 1 ],
 			"url": "option=com_",
 			"meta": { "generator": "Joomla" },
-			"html": "(<!-- JoomlaWorks \\\"K2\\\"|<[^>]+(feed|components)/com_)",
+			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill\\\")",
 			"headers": { "X-Content-Encoded-By": "Joomla" },
 			"env": "^(jcomments)$"
 		},
@@ -878,6 +913,11 @@
 			"cats": [ 13 ],
 			"html": "<img[^>]+ alt=\\\"Powered by Mantis Bugtracker"
 		},
+		"Marketo": {
+			"cats": [ 32 ],
+			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
+			"env": "^Munchkin$"
+		},
 		"MaxSite CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "MaxSite CMS" }
@@ -999,6 +1039,11 @@
 			"script": "netmonitor\\.fi/nmtracker\\.js",
 			"env": "^netmonitor"
 		},
+		"New Relic": {
+			"cats": [ 10 ],
+			"html": "<script[^>]+>var NREUMQ=NREUMQ",
+			"env": "^NREUMQ$"
+		},
 		"Nginx": {
 			"cats": [ 22 ],
 			"headers": { "Server": "nginx" }
@@ -1014,13 +1059,19 @@
 			"cats": [ 6 ],
 			"html": "(<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
 		},
+		"Open Web Analytics": {
+			"cats": [ 10 ],
+			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
+			"env": "^_?owa_"
+		},
 		"OneStat": {
 			"cats": [ 10 ],
 			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route)"
+			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"implies": [ "PHP" ]
 		},
 		"openEngine": {
 			"cats": [ 1 ],
@@ -1040,10 +1091,10 @@
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
-		"Open Web Analytics": {
-			"cats": [ 10 ],
-			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
-			"env": "^_?owa_"
+		"OpenText Web Solutions": {
+			"cats": [ 1 ],
+			"html": "<!--[^>]+published by Open Text Web Solutions",
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"Optimizely": {
 			"cats": [ 10 ],
@@ -1132,6 +1183,11 @@
 			"cats": [ 3 ],
 			"html": "(<title>phpPgAdmin</title>|<span class=\\\"appname\\\">phpPgAdmin)"
 		},
+		"phpSQLiteCMS": {
+			"cats": [ "1" ],
+			"meta": { "generator": "^phpSQLiteCMS" },
+			"implies": [ "PHP" ]
+		},
 		"Piwik": {
 			"cats": [ 10 ],
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
@@ -1286,6 +1342,10 @@
 			"script": "(scriptaculous|protoaculous)\\.js",
 			"env": "^Scriptaculous$"
 		},
+		"SDL Tridion": {
+			"cats": [ 1 ],
+			"html": "mfinfo\\.application='Tridion"
+		},
 		"Sencha Touch": {
 			"cats": [ 26, 12 ],
 			"script": "sencha-touch.*\\.js"
@@ -1308,7 +1368,6 @@
 			"cats": [ 6 ],
 			"meta": { "application-name": "Shopware" },
 			"script": "shopware\\.js",
-			"env": "^Shopify$",
 			"implies": [ "PHP" ]
 		},
 		"sIFR": {
@@ -1348,7 +1407,8 @@
 		},
 		"Snoobi": {
 			"cats": [ 10 ],
-			"script": "snoobi\\.com/snoop\\.php"
+			"script": "snoobi\\.com/snoop\\.php",
+			"env": "^snoobi$"
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
@@ -1360,8 +1420,12 @@
 		},
 		"SPDY": {
 			"cats": [ 19 ],
-			"headers": {
-				"X-Firefox-Spdy": ".*" }
+			"headers": { "X-Firefox-Spdy": ".*" }
+		},
+		"Sphinx": {
+			"cats": [ 4 ],
+			"env": "^DOCUMENTATION_OPTIONS$",
+			"implies": [ "Python" ]
 		},
 		"SPIP": {
 			"cats": [ 1 ],
@@ -1434,6 +1498,10 @@
 			"cats": [ 24 ],
 			"env": "^tinyMCE$"
 		},
+		"Tealeaf": {
+			"cats": [ 10 ],
+			"env": "^TeaLeaf$"
+		},
 		"TomatoCart": {
 			"cats": [ 6 ],
 			"meta": { "generator": "TomatoCart" },
@@ -1585,7 +1653,7 @@
 		},
 		"WebPublisher": {
 			"cats": [ 1 ],
-			"meta": { "generator": "WEB|Publisher" }
+			"meta": { "generator": "WEB\\|Publisher" }
 		},
 		"Websale": {
 			"cats": [ 6 ],
diff --git a/drivers/php/js/wappalyzer.js b/drivers/php/js/wappalyzer.js
index 92a829f4a..5d1631368 100644
--- a/drivers/php/js/wappalyzer.js
+++ b/drivers/php/js/wappalyzer.js
@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;
diff --git a/share/apps.json b/share/apps.json
index 9c56b4c9a..0348fdb27 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -30,7 +30,8 @@
 		"28": "operating-systems",
 		"29": "search-engines",
 		"30": "web-mail",
-		"31": "cdn"
+		"31": "cdn",
+		"32": "marketing-automation"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -96,6 +97,10 @@
 			"env": "amp_js_init",
 			"implies": [ "PHP" ]
 		},
+		"AngularJS": {
+			"cats": [ 12 ],
+			"env": "^angular$"
+		},
 		"AOLserver": {
 			"cats": [ 22 ],
 			"headers": { "Server": "AOLserver" } },
@@ -225,6 +230,10 @@
 		"CFML": {
 			"cats": [ 27 ]
 		},
+		"CacheFly": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
+		},
 		"Chameleon": {
 			"cats": [ 1 ],
 			"meta": { "generator": "chameleon-cms" },
@@ -468,8 +477,9 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ 1 ],
+			"cats": [ "1" ],
 			"meta": { "generator": "DotNetNuke" },
+			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -506,6 +516,10 @@
 			"script": "e107\\.js",
 			"implies": [ "PHP"]
 		},
+		"EdgeCast": {
+			"cats": [ "31" ],
+			"headers": { "Server": "^ECS " }
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -539,7 +553,7 @@
 		"eZ Publish": {
 			"cats": [ 1, 6 ],
 			"meta": { "generator": "eZ Publish" },
-			"headers": {  "X-Powered-By": "^eZ Publish$" },
+			"headers": {  "X-Powered-By": "^eZ Publish" },
 			"implies": [ "PHP" ]
 		},
 		"Fact Finder": {
@@ -622,6 +636,10 @@
 			"cats": [ 22 ],
 			"headers": { "Server": "Google Frontend" }
 		},
+		"Google Code Prettify": {
+			"cats": [ 19 ],
+			"env": "^prettyPrint$"
+		},
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
@@ -636,6 +654,14 @@
 			"cats": [ 1 ],
 			"url": "sites.google.com"
 		},
+		"Google Tag Manager": {
+			"cats": [ 19 ],
+			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+		},
+		"Google Web Toolkit": {
+			"cats": [ 18 ],
+			"env": "^__gwt_"
+		},
 		"GoStats": {
 			"cats": [ 10 ],
 			"env": "^_go(stats|_track)"
@@ -653,6 +679,10 @@
 			"html": "gravityInsightsParams\\.site_guid = '",
 			"env": "^GravityInsights$"
 		},
+		"GX WebManager": {
+			"cats": [ 1 ],
+			"meta": { "generator": "GX WebManager" }
+		},
 		"Handlebars": {
 			"cats": [ 12 ],
 			"env": "^Handlebars$"
@@ -672,7 +702,7 @@
 		},
 		"Hybris": {
 			"cats": [ 6 ],
-			"html": "/sys_master/|/hybr/",
+			"html": "(/sys_master/|/hybr/|/_ui/desktop/)",
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
@@ -730,7 +760,7 @@
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "iWeb" }
+			"meta": { "generator": "^iWeb" }
 		},
 		"Jalios": {
 			"cats": [ 1 ],
@@ -745,6 +775,11 @@
 			"script": "jit.*\\.js",
 			"env": "^\\$jit$"
 		},
+		"Jirafe": {
+			"cats": [ 10, 32 ],
+			"script": "/jirafe\\.js",
+			"env": "^jirafe$"
+		},
 		"Jo": {
 			"cats": [ 26, 12 ],
 			"env": "^jo(Cache|DOM|Event)$"
@@ -758,7 +793,7 @@
 			"cats": [ 1 ],
 			"url": "option=com_",
 			"meta": { "generator": "Joomla" },
-			"html": "(<!-- JoomlaWorks \\\"K2\\\"|<[^>]+(feed|components)/com_)",
+			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill\\\")",
 			"headers": { "X-Content-Encoded-By": "Joomla" },
 			"env": "^(jcomments)$"
 		},
@@ -878,6 +913,11 @@
 			"cats": [ 13 ],
 			"html": "<img[^>]+ alt=\\\"Powered by Mantis Bugtracker"
 		},
+		"Marketo": {
+			"cats": [ 32 ],
+			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
+			"env": "^Munchkin$"
+		},
 		"MaxSite CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "MaxSite CMS" }
@@ -999,6 +1039,11 @@
 			"script": "netmonitor\\.fi/nmtracker\\.js",
 			"env": "^netmonitor"
 		},
+		"New Relic": {
+			"cats": [ 10 ],
+			"html": "<script[^>]+>var NREUMQ=NREUMQ",
+			"env": "^NREUMQ$"
+		},
 		"Nginx": {
 			"cats": [ 22 ],
 			"headers": { "Server": "nginx" }
@@ -1014,13 +1059,19 @@
 			"cats": [ 6 ],
 			"html": "(<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
 		},
+		"Open Web Analytics": {
+			"cats": [ 10 ],
+			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
+			"env": "^_?owa_"
+		},
 		"OneStat": {
 			"cats": [ 10 ],
 			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route)"
+			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"implies": [ "PHP" ]
 		},
 		"openEngine": {
 			"cats": [ 1 ],
@@ -1040,10 +1091,10 @@
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
-		"Open Web Analytics": {
-			"cats": [ 10 ],
-			"html": "<!-- (Start|End) Open Web Analytics Tracker -->",
-			"env": "^_?owa_"
+		"OpenText Web Solutions": {
+			"cats": [ 1 ],
+			"html": "<!--[^>]+published by Open Text Web Solutions",
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"Optimizely": {
 			"cats": [ 10 ],
@@ -1132,6 +1183,11 @@
 			"cats": [ 3 ],
 			"html": "(<title>phpPgAdmin</title>|<span class=\\\"appname\\\">phpPgAdmin)"
 		},
+		"phpSQLiteCMS": {
+			"cats": [ "1" ],
+			"meta": { "generator": "^phpSQLiteCMS" },
+			"implies": [ "PHP" ]
+		},
 		"Piwik": {
 			"cats": [ 10 ],
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
@@ -1286,6 +1342,10 @@
 			"script": "(scriptaculous|protoaculous)\\.js",
 			"env": "^Scriptaculous$"
 		},
+		"SDL Tridion": {
+			"cats": [ 1 ],
+			"html": "mfinfo\\.application='Tridion"
+		},
 		"Sencha Touch": {
 			"cats": [ 26, 12 ],
 			"script": "sencha-touch.*\\.js"
@@ -1308,7 +1368,6 @@
 			"cats": [ 6 ],
 			"meta": { "application-name": "Shopware" },
 			"script": "shopware\\.js",
-			"env": "^Shopify$",
 			"implies": [ "PHP" ]
 		},
 		"sIFR": {
@@ -1348,7 +1407,8 @@
 		},
 		"Snoobi": {
 			"cats": [ 10 ],
-			"script": "snoobi\\.com/snoop\\.php"
+			"script": "snoobi\\.com/snoop\\.php",
+			"env": "^snoobi$"
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
@@ -1360,8 +1420,12 @@
 		},
 		"SPDY": {
 			"cats": [ 19 ],
-			"headers": {
-				"X-Firefox-Spdy": ".*" }
+			"headers": { "X-Firefox-Spdy": ".*" }
+		},
+		"Sphinx": {
+			"cats": [ 4 ],
+			"env": "^DOCUMENTATION_OPTIONS$",
+			"implies": [ "Python" ]
 		},
 		"SPIP": {
 			"cats": [ 1 ],
@@ -1434,6 +1498,10 @@
 			"cats": [ 24 ],
 			"env": "^tinyMCE$"
 		},
+		"Tealeaf": {
+			"cats": [ 10 ],
+			"env": "^TeaLeaf$"
+		},
 		"TomatoCart": {
 			"cats": [ 6 ],
 			"meta": { "generator": "TomatoCart" },
@@ -1585,7 +1653,7 @@
 		},
 		"WebPublisher": {
 			"cats": [ 1 ],
-			"meta": { "generator": "WEB|Publisher" }
+			"meta": { "generator": "WEB\\|Publisher" }
 		},
 		"Websale": {
 			"cats": [ 6 ],
diff --git a/share/images/icons/Snoobi.png b/share/images/icons/Snoobi.png
index c1c900721..0f046cb82 100644
Binary files a/share/images/icons/Snoobi.png and b/share/images/icons/Snoobi.png differ
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 92a829f4a..5d1631368 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;