Fixed round1 and round2 edit questions
Merge remote-tracking branch 'origin/master'