Re-Add Comment ID

Ooops, sorry #59 and #722 and 35f5c5b6b8c