Improved: PHP 5.5 support