refactored gen.filter to gen.rejector
Merge branch 'master' into dev