Fix #2  .Improve the i18n support