Squash commits for i18n from PR #96

Squashed commits for i18n from PR #96