Initial commit of filter support feature.
Merge pull request #607 from Kleofass/patch-1

Initial commit of filter support feature.