Reflecting "haxxxx" recent 5.2 changes

eflecting "haxxxx" recent 5.2 changes for Arms Warrior.
Merge pull request #220 from nishikazuhiro/patch-22

Reflecting "haxxxx" recent 5.2 changes