Merge pull request #642 from StormedBubbles/guncon