Update for language changes
Merge pull request #33 from klutzy/update

Update for language changes