Fix filter
Merge pull request #85 from burrows-codefest/develop

Dev to Master