fixed filter errors
Merge pull request #30 from lapty/master

fixed filter errors
fixed conflict