Fix #187 - Corrected typos and adapted to new logic from English version.
Fix #187 - Corrected too technical string.
Merge pull request #188 from vreixo/issue187

Fix #187 - Corrected typos and adapted to new logic from English version...