Task #140: Add last comment block
Merge branch 'master' into 140