Upgraded to PHP 5.4 standards