Change Match model to better prepare for result calculation.
Merge pull request #71 from paulld/modify_match_model

Change Match model to better prepare for result calculation.