Updated version and improved finder code