merged the encoding plugin to Catalyst.p,
updated changes