Merge "Correction, documentation guide"