Updated comments.
Merge branch 'hotfix/1.4.1_3.1'