Add compatibility for PHP 5.4 and 5.5
Merge pull request #1 from stmllr/master

Add compatibility for PHP 5.4 and 5.5
Merge remote-tracking branch 'upstream/master'