Closes issue #13 - filtering.