Expanding the PHPDoc comments to clarify concepts
Merge commit '2f67367'