update phpdoc
Merge branch 'pr/35' into incoming