Update for language changes
Merge pull request #31 from brson/master

Update for language changes