Added review questions from pr#20
Added review questions from pr#21