fix phpdoc, #35
Merge origin/master