diff --git a/examples/hello_world/Makefile b/examples/hello_world/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..c2c836bbea7849ea01fefba1a5d7263915cf4165
--- /dev/null
+++ b/examples/hello_world/Makefile
@@ -0,0 +1,19 @@
+# Copyright (c) 2014 Cesanta Software
+# All rights reserved
+
+PROG = hello_world
+CFLAGS = -W -Wall -I../.. $(CFLAGS_EXTRA)
+SOURCES = $(PROG).c ../../mongoose.c
+
+all: $(PROG)
+	./$(PROG)
+
+$(PROG): $(SOURCES) Makefile
+	$(CC) -o $(PROG) $(SOURCES) $(CFLAGS)
+
+win:
+	wine cl $(SOURCES) /MD /nologo /DNDEBUG /O1 /I../.. /Fe$(PROG).exe
+	wine $(PROG).exe
+
+clean:
+	rm -rf $(PROG) *.exe *.dSYM *.obj *.exp .*o *.lib *.gc*
diff --git a/examples/hello.c b/examples/hello_world/hello_world.c
similarity index 73%
rename from examples/hello.c
rename to examples/hello_world/hello_world.c
index 00423db92ef171bae3bfa5ca1c9f74e82d2c551f..d985ce135162cac75b51d624a2f257fdb10c70a2 100644
--- a/examples/hello.c
+++ b/examples/hello_world/hello_world.c
@@ -3,16 +3,13 @@
 #include "mongoose.h"
 
 static int ev_handler(struct mg_connection *conn, enum mg_event ev) {
-  int result = MG_FALSE;
-
-  if (ev == MG_REQUEST) {
-    mg_printf_data(conn, "Hello! Requested URI is [%s]", conn->uri);
-    result = MG_TRUE;
-  } else if (ev == MG_AUTH) {
-    result = MG_TRUE;
+  switch (ev) {
+    case MG_AUTH: return MG_TRUE;
+    case MG_REQUEST:
+      mg_printf_data(conn, "Hello! Requested URI is [%s]", conn->uri);
+      return MG_TRUE;
+    default: return MG_FALSE;
   }
-
-  return result;
 }
 
 int main(void) {