implemented the filter
Merge branch 'iss37' into develop; this closes #37