Some minor fixes
Merge pull request #235 from elcodi/minor/minor-phpdoc-fixes

Some minor fixes