made php-version better
Merge branch 'master' into gh-pages