adjust to language changes
Merge pull request #49 from kud1ing/master

Adjust to language changes