Merge pull request #1 from evan108108/master

Update to commit e6c2b60
Filter with AND/OR chain capability
Merge branch 'feature-filter-andor'
Added unittests