Merge pull request #243 from ping19/master

Weapon change setup
Merge remote-tracking branch 'upstream/master'