Correct input and output of criteria
Merge remote-tracking branch 'origin/master'