Filter class added, all functions are static
Merge remote-tracking branch 'origin/master'