Kavakuo Merge pull request #391 from LabHive/UpdateLocalization