Merge pull request #142 from glenwks/master

Tournament Fixes
Merge remote-tracking branch 'genshyft/master'