Updated code to be PHP 5.3/5.4 compatible