REFS #665 - Improved documentation