PHP 5.4
Merge pull request #3 from DominikTo/patch-1

PHP 5.4