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

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