Update for language changes.
Merge pull request #384 from luqmana/update

Update for language changes.