Implement Issue #518
Merge pull request #519 from acinelli/topic_no_zero_likes

Implement Issue #518