Merge pull request #12 from bbinet/better-filtering

Better mirror filtering support