Merge pull request #143 from glenwks/master

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