Merge pull request #2 from SCIF/master

Some phpdoc improvments