Merge "Fixed docs"