991
Merge pull request #1015 from CalebJohn/costume-fixes

Fixes #991