diff --git a/bin/wappalyzer-validate-regex b/bin/wappalyzer-validate-regex
index 2f72564e1..e55e70648 100755
--- a/bin/wappalyzer-validate-regex
+++ b/bin/wappalyzer-validate-regex
@@ -27,6 +27,11 @@ for ( app in json.apps ) {
 					attrs = pattern.split('\\;'),
 					regex = '/' + attrs.shift().replace('/', '\/') + '/';
 
+				//Check if the pattern is a valid RegExp
+				//Note: unlike when used in Wappalyzer, the modifier i isn't added here
+				new RegExp(regex);
+
+
 				if ( /^\/(?:\^\$|\.\+|\.\*)\/$/.test(regex) )  {
 					throw new Error('Pattern should be replaced with empty string.\n' + app + ': ' + type + ': ' + pattern);
 				}
diff --git a/src/apps.json b/src/apps.json
index 301b1c136..4b29569db 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -586,7 +586,7 @@
 			"env": "^Backbone$",
 			"implies": "Underscore.js",
 			"script": "backbone.*\\.js",
-			"website": "documentcloud.github.com/backbone"
+			"website": "backbonejs.org"
 		},
 		"Backdrop": {
 			"cats": [
@@ -3477,6 +3477,12 @@
 			],
 			"website": "lucene.apache.org/core/"
 		},
+		"M.R. Inc BoxyOS": {
+			"cats": [
+				28
+			],
+			"website": "mrincworld.com"
+		},
 		"M.R. Inc Webserver": {
 			"cats": [
 				22
@@ -3484,15 +3490,17 @@
 			"headers": {
 				"Server": "M\\.R\\. Inc Webserver"
 			},
+			"implies": [
+				"M.R. Inc BoxyOS"
+			],
 			"website": "mrincworld.com"
 		},
-		"M.R. Inc Wild CMS": {
+		"M.R. Inc SiteFrame": {
 			"cats": [
-				1,
-				6
+				18
 			],
 			"headers": {
-				"X-Powered-By": "M\\.R\\. Inc Wild CMS"
+				"Powered-By": "M\\.R\\. Inc SiteFrame"
 			},
 			"website": "mrincworld.com"
 		},
@@ -4818,7 +4826,7 @@
 				"<link[^>]* href=\"[^\"]*rainloop/v/([^/]+)\\;version:\\1"
 			],
 			"implies": "PHP",
-			"script": "rainloop/v/([^/]+))\\;version:\\1",
+			"script": "rainloop/v/([^/]+)\\;version:\\1",
 			"website": "rainloop.net"
 		},
 		"RBS Change": {
@@ -7764,4 +7772,4 @@
 		"50": "document-management-systems",
 		"51": "landing-page-builders"
 	}
-}
\ No newline at end of file
+}
diff --git a/src/icons/M.R. Inc Wild CMS.png b/src/icons/M.R. Inc BoxyOS.png
similarity index 100%
rename from src/icons/M.R. Inc Wild CMS.png
rename to src/icons/M.R. Inc BoxyOS.png
diff --git a/src/icons/M.R. Inc SiteFrame.png b/src/icons/M.R. Inc SiteFrame.png
new file mode 100644
index 000000000..1e3e20e1b
Binary files /dev/null and b/src/icons/M.R. Inc SiteFrame.png differ