Filtering & Validation editing
[#18] Reviewed and edited
Merge branch 'hotfix/18'

Close #18