diff --git a/calexium_lib b/calexium_lib
index eb2fde0..e6da20c 160000
--- a/calexium_lib
+++ b/calexium_lib
@@ -1 +1 @@
-Subproject commit eb2fde090283bc3b3544600818bb68f2eafe3541
+Subproject commit e6da20c4dc5c59b7da6393e52d1f5086048061c9
diff --git a/densaku_lib b/densaku_lib
index c20e8ff..e7fa05a 160000
--- a/densaku_lib
+++ b/densaku_lib
@@ -1 +1 @@
-Subproject commit c20e8ff6bc5e539bf89c0067dadc79d1b8300575
+Subproject commit e7fa05a251e0fe746b9524e94b42b5093c4714bf
diff --git a/src/generation/types_messages.anubis b/src/generation/types_messages.anubis
index b50c865..cb04e36 100644
--- a/src/generation/types_messages.anubis
+++ b/src/generation/types_messages.anubis
@@ -125,8 +125,12 @@ define String
       prefix + "  forget(add_string("+type_msg+", \"__TYPE_ALT__\", \""+alt_name+"\")),\n\n",
     
     //generate the alternative with components
-    alternative(alt_name, components_list) then
+    alternative(alt_name, comment, components_list) then
       prefix + "//Alternative "+alt_name+"\n"+
+      (if comment != no_comment then
+        prefix + dump(comment)+"\n"
+       else
+        "")+
       prefix + alt_name + "("+ generate_arguments_list(components_list) +")"+ " then \n"+
       prefix + "  forget(add_string("+type_msg+", \"__TYPE_ALT__\", \""+alt_name+"\"))"+
       generate_component_to_message(prefix+"  ", type_msg, alt_name, components_list)+
@@ -331,9 +335,13 @@ define String
       indent + "else "
     
     //generate the alternative with components
-    alternative(alt_name, components_list) then
+    alternative(alt_name, comment, components_list) then
       with begin = 
       "//Alternative "+alt_name+"\n"+
+      (if comment != no_comment then
+        indent + dump(comment)+"\n"
+       else
+        "")+      
       indent + "if __type_alt__ = \""+alt_name+"\" then //Alternative "+alt_name+"\n"+
       //prefix + alt_name + "("+ generate_arguments_list(components_list) +")"+ " then \n"+
       //prefix + "  forget(add_string("+type_msg+", \"__TYPE_ALT__\", \""+alt_name+"\"))"+
--
libgit2 0.21.4