"backporting" #170 into 0.9.x

(cherry picked from commit 5b1015df91b7740a96299594a3a1727238517c20)
"backporting" #170 into 0.9.x updated docs

(cherry picked from commit be16210d831f566b6ba643b6db612666d121f86a)