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

....