Stage one of multifield matching
Merge pull request #708 from Gravecorp/master

Stage one of multifield matching