Fixes #1 - adding filtering capabilities.