diff --git a/drivers/bookmarklet/images/icons/.gitkeep b/drivers/bookmarklet/images/icons/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/drivers/bookmarklet/json/.gitkeep b/drivers/bookmarklet/json/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/drivers/chrome/images/icons/.gitkeep b/drivers/chrome/images/icons/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/drivers/firefox-xul/skin/images/icons/.gitkeep b/drivers/firefox-xul/skin/images/icons/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/drivers/html/images/icons/.gitkeep b/drivers/html/images/icons/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/share/apps.json b/share/apps.json
index 2a1b8a85c..f13e0a470 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -222,7 +222,7 @@
 		"Apache Tomcat": {
 			"website": "tomcat.apache.org",
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote(/1\\.1)?\\;version:\\1?4.1<: " }
+			"headers": { "Server": "Apache-Coyote(/1\\.1)?\\;version:\\1?4.1<:" }
 		},
 		"Apache Traffic Server": {
 			"website": "trafficserver.apache.org/",
@@ -3429,6 +3429,12 @@
 			"website": "foundation.zurb.com",
 			"cats": [ 18 ],
 			"html": "<link[^>]+foundation[^>\"]+css"
+		},
+		"October CMS": {
+			"website": "octobercms.com",
+			"cats": [ 1 ],
+			"headers": { "Set-Cookie": "october_session=" },
+			"implies": "Laravel"
 		}
 	}
 }
diff --git a/share/images/icons/October CMS.png b/share/images/icons/October CMS.png
new file mode 100644
index 000000000..0bdc1fe84
Binary files /dev/null and b/share/images/icons/October CMS.png differ
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 8e6d5bd42..cccecbad7 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -78,7 +78,7 @@ var wappalyzer = (function() {
 				if ( matches ) {
 					matches.forEach(function(match, i) {
 						// Parse ternary operator
-						var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.+)$').exec(version);
+						var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.*)$').exec(version);
 
 						if ( ternary && ternary.length === 3 ) {
 							w.log({ match: match, i: i, ternary: ternary });