Added comments
Merge commit 'HEAD@{7}'