s/controller/filter
Merge pull request #34 from dchest/filter

s/controller/filter
Merge branch 'master' into german_translation
synchronizes de with en