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

Update for language changes