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

Update for language changes