diff --git a/src/CensorWords.php b/src/CensorWords.php
index 7c372b4..9d5f190 100644
--- a/src/CensorWords.php
+++ b/src/CensorWords.php
@@ -77,9 +77,10 @@ public function randCensor($chars, $len) {
 	/**
 	 *  Apply censorship to $string, replacing $badwords with $censorChar.
 	 *  @param        string          $string        String to be censored.
+	 *  @param        bool            $fullWords     Option to censor by word only.
 	 *  string[string]
 	 */
-	public function censorString($string) {
+	public function censorString($string, $fullWords = false) {
 			$badwords = $this->badwords;
 			$anThis = &$this;
 			
@@ -114,7 +115,11 @@ public function censorString($string) {
 			$words = explode(" ", $string);
 
 			for ($x=0; $x<count($badwords); $x++) {
-				$badwords[$x] =  '/'.str_ireplace(array_keys($leet_replace),array_values($leet_replace), $badwords[$x]).'/i';
+				if($fullWords) {
+					$badwords[$x] =  '/\b'.str_ireplace(array_keys($leet_replace),array_values($leet_replace), $badwords[$x]).'\b/i';
+				} else {
+					$badwords[$x] =  '/'.str_ireplace(array_keys($leet_replace),array_values($leet_replace), $badwords[$x]).'/i';
+				}
 			}
 
 			$counter=0;
diff --git a/tests/CensorTest.php b/tests/CensorTest.php
index df35a5d..add3b2e 100644
--- a/tests/CensorTest.php
+++ b/tests/CensorTest.php
@@ -31,6 +31,19 @@ public function testFuckeryClean()
     
   }
   
+  public function testWordFuckeryClean()
+  {
+    $censor = new CensorWords;
+    $string = $censor->censorString('abc fuck xyz', true);
+    $this->assertEquals('abc **** xyz', $string['clean']);
+
+    $string2 = $censor->censorString('Hello World', true);
+    $this->assertEquals('Hello World', $string2['clean']);
+
+    $string3 = $censor->censorString('fuck...', true);
+    $this->assertEquals('****...', $string3['clean']);
+  }
+  
   public function testFuckeryOrig()
   {
     $censor = new CensorWords;
@@ -70,4 +83,4 @@ public function testSameCensorObj()
   }
     
  
-}
\ No newline at end of file
+}