diff --git a/example_tree.tft b/example_tree.tft
index 46dda23..c0a4c4c 100644
--- a/example_tree.tft
+++ b/example_tree.tft
@@ -1,6 +1,9 @@
 # This is a comment
 # The dating in this tree is according to the Byzantine calendar but relative to Christ's birth
 
+/* This is a multiline
+   comment with a * and a / in it */
+
 Adam
 b: -5509.9.06        # Birthday in format yyyy.mm.dd
 
diff --git a/src/parser.cpp b/src/parser.cpp
index b68d288..4042908 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -143,11 +143,11 @@ namespace /* internal */
 
 	/* [[noreturn]]void err_thirdParent(const string& extra_name) */
 	/* { */
-	/* 	endwin(); */
-	/* 	cerr << "Line " << line << ": two parents are already defined, " */
-	/* 		 << extra_name << " is third\n"; */
-	/* 	cerr.flush(); */
-	/* 	exit(1); */
+	/*	endwin(); */
+	/*	cerr << "Line " << line << ": two parents are already defined, " */
+	/*		 << extra_name << " is third\n"; */
+	/*	cerr.flush(); */
+	/*	exit(1); */
 	/* } */
 
 	[[noreturn]]void err_personUndefined(const string& name)
@@ -172,11 +172,11 @@ namespace /* internal */
 
 	/* void err_name_index(const string& name, U32 i) */
 	/* { */
-	/* 	endwin(); */
-	/* 	cerr << "Line " << line << " the number given after the declaration of a person can" */
-	/* 		" only be his place among the same named. " << i << " doesn't satisfy this for '" */
-	/* 		 << name << '\'' << endl; */
-	/* 	exit(1); */
+	/*	endwin(); */
+	/*	cerr << "Line " << line << " the number given after the declaration of a person can" */
+	/*		" only be his place among the same named. " << i << " doesn't satisfy this for '" */
+	/*		 << name << '\'' << endl; */
+	/*	exit(1); */
 	/* } */
 
 	bool isNum(char c)
@@ -567,6 +567,30 @@ namespace /* internal */
 				--it;
 				break;
 			/* case '0' ... '9': */
+			case '/':
+				if(it+1<end)
+				{
+					if(it[1]=='/')
+					{
+						if(token_begin < it)
+							tokens.emplace_back(token_begin, it);
+						while(++it < end && *it != '\n'); /* skip comment */
+						token_begin = it;
+						--it;
+					}
+					else if(it[1]=='*')
+					{
+						if(token_begin < it)
+							tokens.emplace_back(token_begin, it);
+						while(++it < end)
+							if(*it=='*' && it+1<end && it[1]=='/')
+								break;
+						it+=2;
+						token_begin = it;
+						--it;
+					}
+				}
+				break;
 
 			default: break;
 			}