I added PHP 5.4 compat for FOSS friendly purposes