#13 Comment count added