Doctring
Merge commit '52df8463431e780cd6d1783312a9a2ebebba5e9a'
Fixed comment.
Merge commit '21ed76ac5ce944db0c52cefe595976dc71af8c5d'