Added new matches logic
Added upcoming matches
Merge origin/master