Completion of documentation
Resolve merge conflicts