Merge branch '26_translate_keys'. Resolve #26