Merge pull request #215 from ThePyrotechnic/Dev

no message
Merge pull request #216 from ThePyrotechnic/Dev

small name change
Merge pull request #218 from ThePyrotechnic/Dev

Fix actions
Fixes holster issue