Update for language changes
Merge pull request #4 from cmr/master

Update for language changes