manual merge of filters branch
Merge pull request #22 from diefenbach/filters_0.8

Manual merge of filters branch.