Added pre-filter option. Fixes #33