diff --git a/nsfw.tgz b/nsfw.tgz
index 187ef0150..b9dc85be0 100755
Binary files a/nsfw.tgz and b/nsfw.tgz differ
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 718804996..332e82245 100755
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -86,14 +86,21 @@ function nsfw_prepare_body(&$a,&$b) {
 			if(! strlen(trim($word))) {
 				continue;
 			}
-
-			if(stristr($b['html'],$word)) {
-				$found = true;
-				break;
+			if(strpos($word,'/') === 0) {
+				if(preg_match($word,$b['html'])) {
+					$found = true;
+					break;
+				}
 			}
-			if(stristr($b['item']['tag'], ']' . $word . '[' )) {
-				$found = true;
-				break;
+			else {
+				if(stristr($b['html'],$word)) {
+					$found = true;
+					break;
+				}
+				if(stristr($b['item']['tag'], ']' . $word . '[' )) {
+					$found = true;
+					break;
+				}
 			} 
 		}
 	}