Fix filter
Merge origin/master
Merge pull request #188 from zoic21/master

Merge from master