gun related things
Merge pull request #593 from paprka/somestuff

Some more gun-related things.