Pulling in Fix for Matted Strategy

* pulling in match for matted strategy.
* fixed bug with ndm.
* added test.