Merge pull request #17 from samuelmanzer/master

Filtering bugfix