Corrected some kettle output bugs and made a better output.
Merge branch 'cpk' of https://github.com/webdetails/cpf into cpk