727 added charset parameter

Mapper required for charset parameter to be
passed to it, in order for Japanese characters
to render properly.
Merge branch '727'