Update documentation
Merged conflicts