diff --git a/commentrss.admin.inc b/commentrss.admin.inc
index 3fbfb38..d900f3a 100644
--- a/commentrss.admin.inc
+++ b/commentrss.admin.inc
@@ -34,6 +34,13 @@ function commentrss_admin_settings() {
     '#default_value' => variable_get('commentrss_term', FALSE),
     '#access' => FALSE,
   );
+  // Modified to add setting to include/exclude links
+  $form['commentrss_links'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Inlude links in comment feed'),
+    '#description' => t("Whether to include links such as \"Reply\" in the comment feed."),
+    '#default_value' => variable_get('commentrss_links', TRUE),
+  );
 
   return system_settings_form($form);
 }
diff --git a/commentrss.module b/commentrss.module
index e61dbfa..999762c 100644
--- a/commentrss.module
+++ b/commentrss.module
@@ -96,7 +96,7 @@ function commentrss_entity_info_alter(&$info) {
  * Access callback; determines if the user can access a node's comment RSS.
  */
 function commentrss_node_feed_access($node, $check_view_access = TRUE) {
-  return $node->comment != COMMENT_NODE_HIDDEN && variable_get('commentrss_node', TRUE) && user_access('access comments') && (!$check_view_access || node_access('view', $node));
+  return $node->comment == COMMENT_NODE_OPEN && variable_get('commentrss_node', TRUE) && user_access('access comments') && (!$check_view_access || node_access('view', $node));
 }
 
 /**
@@ -235,6 +235,9 @@ function commentrss_feed(array $cids = NULL, array $channel = array()) {
   }
   $nodes = node_load_multiple($nids);
   $accounts = user_load_multiple($uids);
+  
+  // Whould we include the comments' links?
+  $include_links = variable_get('commentrss_links', TRUE);
 
   $items = '';
   foreach ($comments as $comment) {
@@ -271,8 +274,14 @@ function commentrss_feed(array $cids = NULL, array $channel = array()) {
       $namespaces = array_merge($namespaces, $comment->rss_namespaces);
     }
 
-    // We render comment contents and force links to be last.
-    $build['links']['#weight'] = 1000;
+    if ($include_links) {
+      // We render comment contents and force links to be last.
+      $build['links']['#weight'] = 1000;
+    }
+    else {
+      unset($build['links']);
+    }
+    
     $item_text .= drupal_render($build); // @todo should this respect $item_length like node_feed()?
 
     $items .= format_rss_item($comment->subject, $comment->link, $item_text, $comment->rss_elements);