documentation changes
merge master