Adjusted phpdoc
Merge branch 'master' into ismod