Bug fixes.
Now Requires PHP 5.3