Added encoding of parameter names (see #265 and #266)