Merge pull request #213 from ping19/master

Weapon display setup for use at later stage