Added support to php-5.4 and php-5.5