Merge pull request #255 from ping19/master

Weapon display fixup