fix phpdoc #2
Merge origin/master