diff --git a/src/main/java/org/fundacionjala/coding/sergio/FizzBuzz.java b/src/main/java/org/fundacionjala/coding/sergio/FizzBuzz.java
new file mode 100644
index 0000000..5a9c7cb
--- /dev/null
+++ b/src/main/java/org/fundacionjala/coding/sergio/FizzBuzz.java
@@ -0,0 +1,35 @@
+package org.fundacionjala.coding.sergio;
+
+/**
+ * Created by SergioNavarro on 8/25/2017.
+ */
+public class FizzBuzz {
+
+    /**
+     * @param num input.
+     * @return return.
+     */
+    public String[] resolve(int num) {
+        String[] result = new String[num];
+        boolean normal = true;
+        for (int i = 1; i <= num; i++) {
+            normal = true;
+            if (i % 3 == 0 && i % 5 == 0) {
+                result[i - 1] = "FizzBuzz";
+                normal = false;
+            }
+            if (i % 3 == 0 && normal) {
+                result[i - 1] = "Fizz";
+                normal = false;
+            }
+            if (i % 5 == 0 && normal) {
+                result[i - 1] = "Buzz";
+                normal = false;
+            }
+            if (normal) {
+                result[i - 1] = Integer.toString(i);
+            }
+        }
+        return result;
+    }
+}
diff --git a/src/test/java/org/fundacionjala/coding/sergio/FizzBuzzTest.java b/src/test/java/org/fundacionjala/coding/sergio/FizzBuzzTest.java
new file mode 100644
index 0000000..710f872
--- /dev/null
+++ b/src/test/java/org/fundacionjala/coding/sergio/FizzBuzzTest.java
@@ -0,0 +1,35 @@
+package org.fundacionjala.coding.sergio;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+import static junit.framework.TestCase.assertTrue;
+
+/**
+ * Created by SergioNavarro on 8/25/2017.
+ */
+public class FizzBuzzTest {
+    private FizzBuzz fizzBuzz;
+
+    /**
+     * Initial setup.
+     */
+    @Before
+    public void setUp() {
+        fizzBuzz = new FizzBuzz();
+    }
+
+    /**
+     *
+     */
+    @Test
+    public void test01() {
+        int num = 15;
+        String[] input = {"1", "2", "Fizz", "4", "Buzz", "Fizz", "7", "8", "Fizz", "Buzz", "11", "Fizz", "13", "14",
+        "FizzBuzz"};
+        assertTrue(Arrays.equals(input, fizzBuzz.resolve(num)));
+    }
+
+}