diff --git a/org_mode_samples/comment/Makefile b/org_mode_samples/comment/Makefile
new file mode 100644
index 0000000..c47a86c
--- /dev/null
+++ b/org_mode_samples/comment/Makefile
@@ -0,0 +1,23 @@
+SHELL := bash
+.ONESHELL:
+.SHELLFLAGS := -eu -o pipefail -c
+.DELETE_ON_ERROR:
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rules
+SRCFILES := $(wildcard *.org)
+OUTFILES := $(patsubst %.org,%.tree.txt,$(SRCFILES))
+
+ifeq ($(origin .RECIPEPREFIX), undefined)
+  $(error This Make does not support .RECIPEPREFIX. Please use GNU Make 4.0 or later)
+endif
+.RECIPEPREFIX = >
+
+.PHONY: all
+all: $(OUTFILES)
+
+.PHONY: clean
+clean:
+> rm -rf $(OUTFILES)
+
+%.tree.txt: %.org ../common.el ../dump_org_ast.bash
+> ../dump_org_ast.bash $< $@
diff --git a/org_mode_samples/comment/multiline_comment.org b/org_mode_samples/comment/multiline_comment.org
new file mode 100644
index 0000000..6c5fdee
--- /dev/null
+++ b/org_mode_samples/comment/multiline_comment.org
@@ -0,0 +1,5 @@
+# Comment
+#
+# At the top of the file
+foo
+# Another comment