Merge pull request #258 from ping19/master

Weapon1