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

Manual merge of filters branch.