Changed to use soft filtering instead of hard filtering
Merge pull request #86 from jenniferliddle/devel

Changed to use soft filtering instead of hard filtering