Merge branch 'dev'
php doc coments was added