Merge "Improved/added parameter documentation"