update documentation
merge with latest version