Updated ctiteria, renamed files, modified printout (Jacek, Marian)