Issue 12: Comment need to be fixed.
Issue 12: Comment need to be fixed. Twice.
Issue 53: Fixed twice
Merge branch 'fix-comment'