Corrections due to the Review
Merge remote-tracking branch 'origin/master'