Several corrections after testing
Merge pull request #205 from SergeyChepurin/SergeyChepurin/wps_i18n

Several corrections after testing