Merge pull request #128 from glenwks/master

Bug Fixes for Tournament