Bugs fixed and PHP 5.3 tests added