changed encoder_round2 (from forms to text)
Merge remote-tracking branch 'origin/master'