merging Yans code
Merge branch 'master' of github.com:EOL/eol_php_code