Language changes

It closes #605.