More reliable support of all PHP versions
Merge pull request #7 from giorgiosironi/golden-master-php-simplified

More reliable support of all PHP versions