PHP 5.4 compatibility
Merge pull request #1 from Cyclo/master

PHP 5.4 compatibility