Incorporated changes which were already part of the official CPAN package.