Update documentation
merging