Fixing #20: PHP-5.5 compatbility