diff --git a/app/main/tv/codely/mooc/controller/greeter/GreeterController.java b/app/main/tv/codely/mooc/controller/greeter/GreeterController.java
new file mode 100644
index 00000000..b7ce04ca
--- /dev/null
+++ b/app/main/tv/codely/mooc/controller/greeter/GreeterController.java
@@ -0,0 +1,20 @@
+package tv.codely.mooc.controller.greeter;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+public class GreeterController {
+
+    @GetMapping("/greeter")
+    public Map<String,String> sayHello(@RequestParam String name) {
+        Map<String, String> message = new HashMap<>();
+        message.put("message", "Hello " + name + " from the greeter controller!");
+
+        return message;
+    }
+}
diff --git a/app/test/tv/codely/mooc/controller/greeter/GreeterControllerTest.java b/app/test/tv/codely/mooc/controller/greeter/GreeterControllerTest.java
new file mode 100644
index 00000000..e16d2144
--- /dev/null
+++ b/app/test/tv/codely/mooc/controller/greeter/GreeterControllerTest.java
@@ -0,0 +1,12 @@
+package tv.codely.mooc.controller.greeter;
+
+import org.junit.jupiter.api.Test;
+import tv.codely.mooc.controller.RequestTestCase;
+
+final class GreeterControllerTest extends RequestTestCase {
+
+    @Test
+    public void shouldSayHello() throws Exception {
+        this.getRequest("/greeter?name=Sergi", 200, "{'message': 'Hello Sergi from the greeter controller!'}");
+    }
+}