diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed8f237..b07c1df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ SET (PROJECT_DESCRIPTION "LaTeX representation in the memory.")
 
 SET (MAJOR 0)
 SET (MINOR 1)
-SET (PATCH 9)
+SET (PATCH 10)
 
 LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone)
 
diff --git a/cpack/CMakeLists.txt b/cpack/CMakeLists.txt
index 0b1c593..6452747 100644
--- a/cpack/CMakeLists.txt
+++ b/cpack/CMakeLists.txt
@@ -5,5 +5,6 @@ SET (REDHAT_DEPENDENCIES "vala >= 0.24, glib >= 2.33, libgee >= 0.16")
 SET (REDHAT_SECTION "Applications/Text")
 SET (LICENSE "LGPLv3+")
 SET (WIN32_UNINSTALL_NAME "LVLatStr") # <= 8 symbols for the name
-
+SET (CPACK_NSIS_MENU_LINKS "https://redmine.backbone.ws/projects/latex-struct"
+                           "Homepage for LAview/LaTeX-Struct")
 INCLUDE (CPackCommonRules)
diff --git a/src/latex-struct/Subtable.vala b/src/latex-struct/Subtable.vala
index 532b476..db03215 100644
--- a/src/latex-struct/Subtable.vala
+++ b/src/latex-struct/Subtable.vala
@@ -10,7 +10,7 @@ namespace LAview {
 			/**
 			 * Caption of the table.
 			 */
-			public string caption { get; set; default = ""; }
+			public Text caption { get; set; default = new Text(""); }
 
 			/**
 			 * Any text before the ``Subtable``.
@@ -316,8 +316,9 @@ namespace LAview {
 
 				s.append (before);
 
-				if (caption != "") {
-					s.append (caption);
+				var caption_text = caption.generate ();
+				if (caption_text != "") {
+					s.append (caption_text);
 					if (size != 0)
 						s.append ("\\tabularnewline");
 				}
diff --git a/src/latex-struct/TableParser.vala b/src/latex-struct/TableParser.vala
index c16a9de..6a99e7f 100644
--- a/src/latex-struct/TableParser.vala
+++ b/src/latex-struct/TableParser.vala
@@ -63,7 +63,7 @@ namespace LAview {
 			                             uint matched_tag_abspos_right) throws ParseError {
 			    // TODO: Similar ro TabularParser::process_tabularnewline (), make a template method?
 				if (in_caption) {
-					subtable.caption = contents[row_abs_pos:tag_left_abspos].compress ();
+					subtable.caption = new Text (contents[row_abs_pos:tag_left_abspos].compress ());
 					in_caption = false;
 				} else {
 					TokenType token = add_cell (subcontents);
@@ -346,10 +346,10 @@ namespace LAview {
 				TOPRULE, MIDRULE, CMIDRULE, BOTTOMRULE, NOALIGN, ADDLINESPACE
 			}
 
-			void end_subtable (Table.ATable table,
+			void end_subtable (ATable table,
 			                   TableTagType subtable_type, uint tag_left_abspos) {
 				if (in_caption) {
-					subtable.caption = contents[row_abs_pos:tag_left_abspos].compress ();
+					subtable.caption = new Text (contents[row_abs_pos:tag_left_abspos].compress ());
 					in_caption = false;
 				} else {
 					subtable.after = contents[row_abs_pos:tag_left_abspos];
@@ -385,7 +385,7 @@ namespace LAview {
 				subtable = new Subtable ();
 			}
 
-			protected TokenType scan_tex_symbol (Table.ATable table) throws ParseError {
+			protected TokenType scan_tex_symbol (ATable table) throws ParseError {
 				var tag = 0U;
 				var matched_tag_length = fifo_is_tag (local_tokens_to_class_start, out tag);
 				var message = "";