By Lud: Damage is now calculated correctly
Merging