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

Update for language changes