Update for language changes
Merge pull request #42 from klutzy/upstream

Update for language changes