making counterexample lifters more generic
Merge remote-tracking branch 'origin/master'