Debugged double hit and some damage calculations.
Merge origin/master