implement filters
Merge branch 'filters' into develop
Fixes #11 Merge branch 'develop'