Merge branch 'issue/33' into 'master'

Issue #33: Improve filter matching

See merge request !39
1 job for master in 46 seconds (queued for 5 seconds)