Schnorr
Merge origin/master