fixes
DEP-61 filters removed, some refactorisation
Merge pull request #62 from maciejborkowski/dev

DEP-61 filters removed, some refactorisation