REFS: #255 Internatinalization addition