Update comment/PHPDoc
Merge remote-tracking branch 'origin/master'