diff --git a/ikercelorrio/java/StringCalculator/src/StringCalculator.java b/ikercelorrio/java/StringCalculator/src/StringCalculator.java
index b4edc2d..5a60a73 100644
--- a/ikercelorrio/java/StringCalculator/src/StringCalculator.java
+++ b/ikercelorrio/java/StringCalculator/src/StringCalculator.java
@@ -12,6 +12,10 @@ public int Add(String numbers)
     {
         if (numbers.isEmpty()) 
             return 0;
-        return Integer.parseInt(numbers);
+        if (numbers.indexOf(',') == -1)
+            return Integer.parseInt(numbers);
+        
+        String[] numArray = numbers.split(",");
+        return Integer.parseInt(numArray[0]) + Integer.parseInt(numArray[1]);
     }
 }
diff --git a/ikercelorrio/java/StringCalculator/test/StringCalculatorTest.java b/ikercelorrio/java/StringCalculator/test/StringCalculatorTest.java
index b8124ff..2baadc2 100644
--- a/ikercelorrio/java/StringCalculator/test/StringCalculatorTest.java
+++ b/ikercelorrio/java/StringCalculator/test/StringCalculatorTest.java
@@ -52,4 +52,10 @@ public void NumeroSumaNumero()
         assertEquals(1, calc.Add("1"));
         assertEquals(2, calc.Add("2"));
     }
+    
+    @Test
+    public void NumerosSerparadosPorComas()
+    {
+        assertEquals(3, calc.Add("1,2"));
+    }
 }