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

Update for language changes