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

Stage one of multifield matching