ZModToECZmodPrimeEncoder extended. 4 different values for "shift" used.
Merge remote-tracking branch 'origin/master'