Merge "Fixed some @params documentation"