diff --git a/reference/Tuple/Tuple.cpp b/reference/Tuple/Tuple.cpp
index 5ee8e526f..d0ecd4c19 100644
--- a/reference/Tuple/Tuple.cpp
+++ b/reference/Tuple/Tuple.cpp
@@ -36,7 +36,7 @@ CONSOLE_APP_MAIN
 	DUMP(i);
 	DUMP(s);
 	
-	Index< Tuple2<int, String> > ndx;
+	Index< Tuple<int, String> > ndx;
 	ndx.Add(x);
 	ndx.Add(y);
 	
diff --git a/reference/UrlInfo/UrlInfo.cpp b/reference/UrlInfo/UrlInfo.cpp
new file mode 100644
index 000000000..6fc8711ea
--- /dev/null
+++ b/reference/UrlInfo/UrlInfo.cpp
@@ -0,0 +1,22 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	StdLogSetup(LOG_COUT|LOG_FILE);
+
+	UrlInfo f("http://username:password@hostname:9090/path?arg=value&aarg[]=item1&aarg[]=item2#anchor");
+
+	DUMP(f.url);
+	DUMP(f.scheme);
+	DUMP(f.host);
+	DUMP(f.port);
+	DUMP(f.user);
+	DUMP(f.password);
+	DUMP(f.path);
+	DUMP(f.query);
+	DUMP(f.fragment);
+	DUMP(f.parameters);
+	DUMP(f.array_parameters);
+}
diff --git a/reference/UrlInfo/UrlInfo.upp b/reference/UrlInfo/UrlInfo.upp
new file mode 100644
index 000000000..ba13b7c76
--- /dev/null
+++ b/reference/UrlInfo/UrlInfo.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	UrlInfo.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/UrlInfo/init b/reference/UrlInfo/init
new file mode 100644
index 000000000..d2c98a5c9
--- /dev/null
+++ b/reference/UrlInfo/init
@@ -0,0 +1,4 @@
+#ifndef _UrlInfo_icpp_init_stub
+#define _UrlInfo_icpp_init_stub
+#include "Core/init"
+#endif