Brawler, Slayer, Swashbuckler fixes
Merge pull request #96 from SecretWizard/patch-21

Brawler, Slayer, Swashbuckler fixes