Add some comments.
Merging origin/goliver/master-pending-add-comment into master