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

Update for language changes