PHP5.4 compatibility
Merge pull request #3 from ryansnowden/master

PHP 5.4 compatibility