Updated version string matching to allow 2 and 3 digit version numbers