Issue #11: Added to comments