Feature/eva phuc

Change pull request to branch "aucfan-shimma/php-api" master