Merge pull request #24 from bcyeah/master

[79203538] NLS support