Predicate enhancement. Compile OK but most of them not tested properly yet
Merge remote-tracking branch 'moritz/master'