modify language messages and merge pull request #1 from Remo