Adding filter options
Merge pull request #71 from imonteiro/master

@imonteiro looking good.
(sadly travis seems to have problems, but 5.3.3 test passed)