Merge pull request #664 from grandoc/develop

fix language