Big phpdoc fixes patch
Merge pull request #44 from SCIF/1.7/develop

Big phpdoc fixes patch