Fix some PHP 5.4 (and higher) issues
Merge pull request #14 from mvdriel/fix-php-5.4-issues

Fix some PHP 5.4 (and higher) issues