Merged fixes.
Fixed #12, added test. Needed new rule.
Re-published filter.