Update for language changes.
Merge pull request #49 from chris-morgan/master

Update for language changes.