fixes #15
Merge branch 'filterclass#15'