Fixed bug in match win selection
Merge branch 'release/0.2.4'