Update for language changes
Merge pull request #4 from pcwalton/language-changes

Update for language changes