diff --git a/estraverse.js b/estraverse.js
index 09ae478..010ec96 100644
--- a/estraverse.js
+++ b/estraverse.js
@@ -773,7 +773,19 @@
                 while (cursor < comments.length) {
                     comment = comments[cursor];
                     if (comment.extendedRange[1] > node.range[0]) {
-                        break;
+                      // Collect inline comments
+                      if (comment.extendedRange[0] < node.range[1]) { // Don't handle trailing comment which starts after the node 
+                        if ((node.type === Syntax.ObjectExpression && node.properties.length === 0) ||
+                          (node.type === Syntax.BlockStatement && node.body.length === 0)) {
+                          if (!node.inlineComments) {
+                            node.inlineComments = [];
+                          }
+                          node.inlineComments.push(comment);
+                          comments.splice(cursor, 1);
+                          continue;			
+                        }
+                      }
+                      break;
                     }
 
                     if (comment.extendedRange[1] === node.range[0]) {