Merge remote-tracking branch 'origin/master'

README.md

@@ -32,15 +32,16 @@ Pretty formats the JSON output. You may pass `lf` (line feed) if you want to use
 than the default `\n`. If you want to indent (` id` argument) with something else than `\t` (a tab)
 you can pass that as arguments as well. And if you want to have something else than ` ` (single space) after
 colons `:` (`ac` argument) in json, you can change that as well, try for example `\n`. If you'd like to use
-an encoder other than cJSON, pass the encoding function as the 5th argument. It should accept anything as
-input parameter, and ff there is a problem with encoding this function should return `nil` and an error
+an encoder other than cJSON, pass the encoding function as the 5th argument (`ec`). It should accept anything as
+input parameter, and if there is a problem with encoding this function should return `nil` and an error
 message, such as:
 
 ```lua
 nil, "Cannot serialise function: type not supported"
 ```
 
-For input argument `dt` it accepts anything that `cjson.encode` accepts.
+For input argument `dt` it accepts anything that `cjson.encode` accepts (or whatever the custom encoding
+function accepts).
 
 ##### Example