Updated comments.
Merge