Added GetMatchById() method