diff --git a/app/main/tv/codely/mooc/controller/greeter/GreeterGetController.java b/app/main/tv/codely/mooc/controller/greeter/GreeterGetController.java
new file mode 100644
index 00000000..88e5cdd4
--- /dev/null
+++ b/app/main/tv/codely/mooc/controller/greeter/GreeterGetController.java
@@ -0,0 +1,20 @@
+package tv.codely.mooc.controller.greeter;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+
+@RestController
+public final class GreeterGetController {
+
+    @RequestMapping("/greeter")
+    public HashMap<String, String> index(@RequestParam String name) {
+        HashMap<String, String> resp = new HashMap<>();
+        String greet = "hello " + name;
+        resp.put("response", greet);
+
+        return resp;
+    }
+}
diff --git a/app/test/tv/codely/mooc/controller/greeter/GreeterGetControllerTest.java b/app/test/tv/codely/mooc/controller/greeter/GreeterGetControllerTest.java
new file mode 100644
index 00000000..f19f378c
--- /dev/null
+++ b/app/test/tv/codely/mooc/controller/greeter/GreeterGetControllerTest.java
@@ -0,0 +1,11 @@
+package tv.codely.mooc.controller.greeter;
+
+import org.junit.jupiter.api.Test;
+import tv.codely.mooc.controller.RequestTestCase;
+
+public final class GreeterGetControllerTest extends RequestTestCase {
+    @Test
+    public void it_should_get_a_greeter_response() throws Exception {
+        this.getRequest("/greeter?name=pepe", 200, "{'response': 'hello pepe'}");
+    }
+}