added docs
Merge commit 'ff79eb2'
Merge branch 'master' into dev