Filters handling
Merge pull request #38 from unikum/master

Filters handling