update documentation
merge