phpdoc Fixes
Merge pull request #762 from mnapoli/phpdoc

phpdoc Fixes