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

Update for language changes