Pass regexp as arguments. Really closes #10