Some media match optimizations
Merge pull request #67 from iWeaverMan/master

Some media match optimizations