Fix Issue #1: Add support for comment toggle