update for language changes
Merge pull request #15 from yichoi/pull-0501

update for language changes