Updated changes - Ready for push to CPAN