fixes documentation
updates documentation
Merge remote-tracking branch 'github/master'
Merge branch 'master' into develop