update documentation
typo
merge master