More filters

This goes a long way towards fixing issue #14.

Note that this pull request should be merged after #20.