Language changes

It closes #717.