Update for language changes
Fix tests
Merge pull request #7 from pcwalton/language-changes

Update for language changes