Issue #89 - The other half of comment implementation