Merge pull request #813 from david22swan/Loc_update