Added toggle comment support

Closes #1