Update for language changes
Merge pull request #102 from bjz/update

Update for language changes