added docs
Merge commit 'ff79eb2'