Manually resolve #14
Should have been included in #16
Merge branch 'create_match'