merged with gh-pages
made PHP-Version better
Merge branch 'master' into gh-pages