1.5.x - #95 - keywords decoder

#95 - backport for 1.5.x