Fix missing import.
Improve client documentation.
Merge remote-tracking branch 'origin/master'