#8, be more flexible in extracting the name/version pairs