diff --git a/bazaar/ExpandFrameExample/ExpandFrameExample.lay b/bazaar/ExpandFrameExample/ExpandFrameExample.lay
new file mode 100644
index 000000000..e1eb2e263
--- /dev/null
+++ b/bazaar/ExpandFrameExample/ExpandFrameExample.lay
@@ -0,0 +1,25 @@
+LAYOUT(Pane1Layout, 248, 176)
+	ITEM(EditString, dv___0, HSizePosZ(108, 4).TopPosZ(60, 19))
+	ITEM(EditString, dv___1, HSizePosZ(108, 4).TopPosZ(84, 19))
+	ITEM(EditString, dv___2, HSizePosZ(108, 4).TopPosZ(108, 19))
+	ITEM(EditString, dv___3, HSizePosZ(108, 4).TopPosZ(132, 19))
+	ITEM(EditString, dv___4, HSizePosZ(108, 4).TopPosZ(152, 19))
+	ITEM(Label, dv___5, SetLabel(t_("Field 2:")).LeftPosZ(4, 100).TopPosZ(60, 19))
+	ITEM(Label, dv___6, SetLabel(t_("Field 3:")).LeftPosZ(4, 100).TopPosZ(84, 19))
+	ITEM(Label, dv___7, SetLabel(t_("Field 4:")).LeftPosZ(4, 100).TopPosZ(108, 19))
+	ITEM(Label, dv___8, SetLabel(t_("Field 5:")).LeftPosZ(4, 100).TopPosZ(132, 19))
+	ITEM(Label, dv___9, SetLabel(t_("Field 6:")).LeftPosZ(4, 100).TopPosZ(152, 19))
+	ITEM(Label, dv___10, SetLabel(t_("Field 1:")).LeftPosZ(4, 100).TopPosZ(36, 19))
+	ITEM(EditString, dv___11, HSizePosZ(108, 4).TopPosZ(36, 19))
+	ITEM(Option, horz, SetLabel(t_("Horizontal alignment")).HCenterPosZ(164, 2).TopPosZ(8, 16))
+END_LAYOUT
+
+LAYOUT(Pane2Layout, 240, 64)
+	ITEM(SliderCtrl, dv___0, HSizePosZ(80, 4).TopPosZ(24, 16))
+	ITEM(Label, dv___1, SetLabel(t_("Slider 2:")).LeftPosZ(4, 72).TopPosZ(24, 16))
+	ITEM(SliderCtrl, dv___2, HSizePosZ(80, 4).TopPosZ(44, 16))
+	ITEM(Label, dv___3, SetLabel(t_("Slider 3:")).LeftPosZ(4, 72).TopPosZ(44, 16))
+	ITEM(SliderCtrl, dv___4, HSizePosZ(80, 4).TopPosZ(4, 16))
+	ITEM(Label, dv___5, SetLabel(t_("Slider 1:")).LeftPosZ(4, 72).TopPosZ(4, 16))
+END_LAYOUT
+
diff --git a/bazaar/ExpandFrameExample/ExpandFrameExample.upp b/bazaar/ExpandFrameExample/ExpandFrameExample.upp
new file mode 100644
index 000000000..83fd7cf96
--- /dev/null
+++ b/bazaar/ExpandFrameExample/ExpandFrameExample.upp
@@ -0,0 +1,13 @@
+description "Bazaar: ExpandFrame/ExpanderCtrl example. Author: James Thomas(mrjt)";
+
+uses
+	CtrlLib,
+	ExpandFrame;
+
+file
+	main.cpp,
+	ExpandFrameExample.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/bazaar/ExpandFrameExample/init b/bazaar/ExpandFrameExample/init
new file mode 100644
index 000000000..45f9ee526
--- /dev/null
+++ b/bazaar/ExpandFrameExample/init
@@ -0,0 +1,5 @@
+#ifndef _ExpandFrameExample_icpp_init_stub
+#define _ExpandFrameExample_icpp_init_stub
+#include "CtrlLib/init"
+#include "ExpandFrame/init"
+#endif
diff --git a/bazaar/ExpandFrameExample/main.cpp b/bazaar/ExpandFrameExample/main.cpp
new file mode 100644
index 000000000..95140ee38
--- /dev/null
+++ b/bazaar/ExpandFrameExample/main.cpp
@@ -0,0 +1,55 @@
+#include <CtrlLib/CtrlLib.h>
+#include <ExpandFrame/ExpandFrame.h>
+using namespace Upp;
+
+#define LAYOUTFILE <ExpandFrameExample/ExpandFrameExample.lay>
+#include <CtrlCore/lay.h>
+
+// Simple window definition
+class ExpandFrameExample : public TopWindow {
+public:
+	typedef ExpandFrameExample CLASSNAME;
+	ExpandFrameExample();
+	
+	void OnHorz();
+private:
+	ExpanderCtrl 					expander;
+	WithPane1Layout<ParentCtrl> 	pane1;
+	WithPane2Layout<ParentCtrl> 	pane2;
+	DocEdit							editor;
+};
+
+
+ExpandFrameExample::ExpandFrameExample()
+{
+	Size sz = Size(400, 500);
+	Title("Expandable Frame Example").Sizeable();
+	SetMinSize(sz);
+	SetRect(sz);
+	        
+	// Add ExpanderCtrl to the window
+	Add(expander.SizePos());
+	
+	// Adding layouts to the expanderctrl
+	CtrlLayout(pane1);
+	pane1.horz <<= THISBACK(OnHorz);
+	expander.AddExpander(pane1, true).SetTitle("Pane 1"); // Open 
+	
+	CtrlLayout(pane2);
+	expander.AddExpander(pane2, false).SetTitle("Pane 2"); // Not open
+	
+	// Add a DocEdit to	the ExpanderCtrl
+	editor <<= "ExpanderCtrl example application";
+	expander.AddExpander(editor, true, 300).SetTitle("Editor");
+}
+
+void ExpandFrameExample::OnHorz()
+{
+	expander.Horz(pane1.horz);
+}
+
+GUI_APP_MAIN
+{
+	ExpandFrameExample().Run();
+}
+