updated comments when I am reviewing
Merge remote-tracking branch 'origin/master'