Full version with additional alphabet
Merge branch 'master' into additional_alphabet