Added Or operator, and parameterization.