New locators added
Minor fix
merge