I believe this fixes the weapon/armor issue for now.
Merge pull request #53 from drobbs/FixingWeaponArmor

I believe this fixes the weapon/armor issue for now.