Updated for PHP 5.4

Updated for PHP 5.4