Merge pull request #127 from dawud/support/troopers16_presentation_fixes