speedup filtering
Merge pull request #26 from crosbymichael/speedup_filtering