Bug fixes.<br />Now Requires PHP 5.3