diff --git a/Frontend Angular 4/src/app/layout/canvas/canvas.component.ts b/Frontend Angular 4/src/app/layout/canvas/canvas.component.ts
index 5b01a4ac39bbc13b521ef43532f755c66ac5e7ad..5a699e250c7242675a70a4e6639d444d12f15f20 100644
--- a/Frontend Angular 4/src/app/layout/canvas/canvas.component.ts	
+++ b/Frontend Angular 4/src/app/layout/canvas/canvas.component.ts	
@@ -223,6 +223,8 @@ export class CanvasComponent {
                 expresion = " Math.abs(("+this.generarExpresion(exp.exp1)+") - ("+this.generarExpresion(exp.exp2)+")) < delta && hayPunto() ";
             }else if (exp.op == "/="){
                 expresion = " Math.abs(("+this.generarExpresion(exp.exp1)+") - ("+this.generarExpresion(exp.exp2)+")) > delta ||  Math.abs(("+this.generarExpresion(exp.exp1)+") - ("+this.generarExpresion(exp.exp2)+")) < delta && !hayPunto()  ";
+            }else if (exp.op == "^"){
+                expresion = " Math.pow("+this.generarExpresion(exp.exp1)+","+this.generarExpresion(exp.exp2)+") ";
             }else{
                 expresion = " ("+this.generarExpresion(exp.exp1)+")"+exp.op+"("+this.generarExpresion(exp.exp2)+") ";
             }
diff --git a/Frontend Angular 4/src/app/shared/config.ts b/Frontend Angular 4/src/app/shared/config.ts
index e5b48168ac6ac14bb205b1a53d1043eec5ae2f16..908ea5f8512f770e5d68cfb779c9a89a5a146f22 100644
--- a/Frontend Angular 4/src/app/shared/config.ts	
+++ b/Frontend Angular 4/src/app/shared/config.ts	
@@ -1,8 +1,8 @@
 //export const SERVER = 'https://matefun.mybluemix.net';
 //export const GHCI_URL = 'wss://matefun.mybluemix.net/endpoint';
 
-export const SERVER = 'http://localhost:9090';
-export const GHCI_URL = 'ws://localhost:9090/endpoint';
+export const SERVER = 'http://localhost:9080';
+export const GHCI_URL = 'ws://localhost:9080/endpoint';
 
 //Configuracion dinamica pensando en servidor con ip dinamica
 //export const SERVER = window.location.protocol + '//' + window.location.host;//'http://localhost:9090';
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun
index 8791ec507184edb55b2f5a6e5a822c7aab059a34..d9b05c27393b87e376a7ff90c214f571a8f615e3 100755
Binary files a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun differ