War Update
Merge pull request #558 from mendo13/patch-25

War Update