diff --git a/uppdev/PainterExamples/PainterExamples.upp b/uppdev/PainterExamples/PainterExamples.upp
index 8d440ed59..3bab5be9f 100644
--- a/uppdev/PainterExamples/PainterExamples.upp
+++ b/uppdev/PainterExamples/PainterExamples.upp
@@ -1,4 +1,4 @@
-description "Antialiased renderer class, Painter, examples, version 2.0";
+description "Antialiased renderer class, Painter, examples, version 2.0\377";
 
 uses
 	CtrlLib,
@@ -17,7 +17,7 @@ file
 	ColorStops.cpp,
 	Radial.cpp,
 	RadialFocus.cpp,
-	TextFillSolid.cpp,
+	TextFillSolid.cpp charset "UTF-8",
 	TextFillGradient.cpp,
 	TextStrokeGradient.cpp,
 	Div.cpp,
diff --git a/uppdev/PainterExamples/TextFillSolid.cpp b/uppdev/PainterExamples/TextFillSolid.cpp
index c5036d5cc..42f8c516c 100644
--- a/uppdev/PainterExamples/TextFillSolid.cpp
+++ b/uppdev/PainterExamples/TextFillSolid.cpp
@@ -1,5 +1,11 @@
 #include "Examples.h"
 
+void TextCoding(Painter& sw)
+{
+	sw.Text(100, 100, "Hello world! ščřůúžýáíé Běifānghuà 北方話",
+	        Font().FaceName("Bitstream Vera Sans Mono").Height(20))
+	  .Fill(LtBlue());	
+}
 void TextFillSolid(Painter& sw)
 {
 	sw.Text(100, 100, "Hello world!", Roman(120).Italic().Bold())
@@ -33,4 +39,5 @@ void SomeTexts(Painter& sw)
 INITBLOCK {
 	RegisterExample("Filling text with solid color", TextFillSolid);
 	RegisterExample("Various fonts", SomeTexts);
+	RegisterExample("Filling text with solid color, replacements & compositions", TextCoding);
 }
diff --git a/uppdev/empty/empty.upp b/uppdev/empty/empty.upp
new file mode 100644
index 000000000..e69de29bb