Feature/comments count

:innocent: