diff --git a/Changelog.txt b/Changelog.txt
index d5c54c006..72d2a53dc 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -3,12 +3,14 @@ Changelog:
 
 Version 1.3.00-dev
  - Added ability to customize drops for Excavation skill
+ - Added player notification for when they stop Bleeding
  - Added configuration option to control mcMMO reporting damage events
  - Added hunger regain bonuses to Herbalism skill
  - Added framework for new Blast Mining skill
  - Added Fast Food Service subskill to Taming
  - Re-added mcMMO reporting damage events
  - Fixed /mcability not respecting permissions
+ - Changed Swords Bleeding effect to never kill
  - Changed to use Bukkit's built-in ignoreCancelledEvents system
  - Changed chat logging for /p & /a
  - Changed Tree Feller to use per-use ArrayList
diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
index 7c17df897..57656c9ab 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
@@ -608,9 +608,17 @@ public class PlayerProfile
 	}
 	public void setBleedTicks(Integer newvalue){
 		bleedticks = newvalue;
+		
+		//Cap maximum ticks at 10
+        if(bleedticks > 10)
+            bleedticks = 10;
 	}
 	public void addBleedTicks(Integer newvalue){
 		bleedticks+=newvalue;
+		
+		//Cap maximum ticks at 10
+		if(bleedticks > 10)
+		    bleedticks = 10;
 	}
 	/*
 	 * EXPLOIT PREVENTION
diff --git a/src/main/java/com/gmail/nossr50/runnables/mcTimer.java b/src/main/java/com/gmail/nossr50/runnables/mcTimer.java
index 388ef90a8..c915c53fb 100644
--- a/src/main/java/com/gmail/nossr50/runnables/mcTimer.java
+++ b/src/main/java/com/gmail/nossr50/runnables/mcTimer.java
@@ -21,6 +21,7 @@ import com.gmail.nossr50.Combat;
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.skills.Swords;
 
@@ -62,8 +63,18 @@ public class mcTimer implements Runnable
 			 */
 			if(thecount % 2 == 0 && PP.getBleedTicks() >= 1)
 			{
-        		Combat.dealDamage(player, 2);
+			    //Never kill with Bleeding
+			    if(player.getHealth() - 2 < 0)
+			    {
+			        if(player.getHealth() - 1 > 0)
+			            Combat.dealDamage(player, 1);
+			    } else
+			        Combat.dealDamage(player, 2);
+			    
         		PP.decreaseBleedTicks();
+        		
+        		if(PP.getBleedTicks() == 0)
+        		    player.sendMessage(mcLocale.getString("Swords.StoppedBleeding"));
         	}
 		
 			/*
diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties
index cda843c07..d5a96ae65 100644
--- a/src/main/resources/locale/locale_de.properties
+++ b/src/main/resources/locale/locale_de.properties
@@ -399,4 +399,5 @@ m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal when they attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
\ No newline at end of file
+m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
\ No newline at end of file
diff --git a/src/main/resources/locale/locale_en_us.properties b/src/main/resources/locale/locale_en_us.properties
index cc145e0c3..c0077ce8e 100644
--- a/src/main/resources/locale/locale_en_us.properties
+++ b/src/main/resources/locale/locale_en_us.properties
@@ -392,4 +392,5 @@ m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal when they attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
\ No newline at end of file
+m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
\ No newline at end of file
diff --git a/src/main/resources/locale/locale_es_es.properties b/src/main/resources/locale/locale_es_es.properties
index ac834c6f9..18bc34837 100644
--- a/src/main/resources/locale/locale_es_es.properties
+++ b/src/main/resources/locale/locale_es_es.properties
@@ -392,4 +392,5 @@ m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal when they attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
\ No newline at end of file
+m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
\ No newline at end of file
diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties
index 091956239..7486046aa 100644
--- a/src/main/resources/locale/locale_fi.properties
+++ b/src/main/resources/locale/locale_fi.properties
@@ -371,4 +371,5 @@ m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal when they attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
\ No newline at end of file
+m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
\ No newline at end of file
diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties
index acfcc2739..a050dc07e 100644
--- a/src/main/resources/locale/locale_fr.properties
+++ b/src/main/resources/locale/locale_fr.properties
@@ -392,4 +392,5 @@ m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal when they attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
\ No newline at end of file
+m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
\ No newline at end of file
diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties
index e5fbeba97..3e1c8e5cf 100644
--- a/src/main/resources/locale/locale_nl.properties
+++ b/src/main/resources/locale/locale_nl.properties
@@ -398,4 +398,5 @@ m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal when they attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
\ No newline at end of file
+m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
\ No newline at end of file
diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties
index 68fb5d87b..e0298c97e 100644
--- a/src/main/resources/locale/locale_pl.properties
+++ b/src/main/resources/locale/locale_pl.properties
@@ -392,4 +392,5 @@ m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal when they attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
\ No newline at end of file
+m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
\ No newline at end of file
diff --git a/src/main/resources/locale/locale_pt_br.properties b/src/main/resources/locale/locale_pt_br.properties
index df1c25802..5003429c9 100644
--- a/src/main/resources/locale/locale_pt_br.properties
+++ b/src/main/resources/locale/locale_pt_br.properties
@@ -402,4 +402,5 @@ m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal when they attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
\ No newline at end of file
+m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
\ No newline at end of file
diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties
index 2794672d5..3f2d064d3 100644
--- a/src/main/resources/locale/locale_ru.properties
+++ b/src/main/resources/locale/locale_ru.properties
@@ -384,4 +384,5 @@ m.EffectsTaming8_0=Fast Food Service
 m.EffectsTaming8_1=Chance for wolves to heal when they attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
\ No newline at end of file
+m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
\ No newline at end of file