Adding pairing and playoff support
Merge remote-tracking branch 'origin/master'