Merge pull request #380 from rav-rav/filtering