Some filter performance improvements
Fixes #80
Merge branch '1.0.4b'